FreeNAS

Revision: 13084
          http://freenas.svn.sourceforge.net/freenas/?rev=13084&view=rev
Author:   zippybr
Date:     2013-01-22 12:06:57 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
Sort snapshots using bytes for used/refer instead of strng comparision

ticket: #2013

Modified Paths:
--------------
    trunk/gui/middleware/notifier.py
    trunk/gui/storage/views.py

Modified: trunk/gui/middleware/notifier.py
===================================================================
--- trunk/gui/middleware/notifier.py	2013-01-22 11:47:17 UTC (rev 13083)
+++ trunk/gui/middleware/notifier.py	2013-01-22 12:06:57 UTC (rev 13084)
@@ -35,6 +35,7 @@
 """
 
 from collections import OrderedDict
+from decimal import Decimal
 import ctypes
 import errno
 import glob
@@ -3303,6 +3304,18 @@
             raise MiddlewareError('Unable to scrub %s: %s' % (name, stderr))
         return True
 
+    def _zfs_size_to_bytes(self, size):
+        if 'K' in size:
+            return Decimal(size.replace('K', '')) * 1024
+        elif 'M' in size:
+            return Decimal(size.replace('M', '')) * 1048576
+        elif 'G' in size:
+            return Decimal(size.replace('M', '')) * 1073741824
+        elif 'T' in size:
+            return Decimal(size.replace('M', '')) * 1099511627776
+        else:
+            return size
+
     def zfs_snapshot_list(self, path=None):
         fsinfo = dict()
 
@@ -3332,7 +3345,9 @@
                         ('fullname', snapname),
                         ('name', name),
                         ('used', used),
+                        ('usedb', float(self._zfs_size_to_bytes(used))),
                         ('refer', refer),
+                        ('referb', float(self._zfs_size_to_bytes(refer))),
                         ('mostrecent', mostrecent),
                         ('parent', 'filesystem' if fs not in zvols else 'volume'),
                         ]))

Modified: trunk/gui/storage/views.py
===================================================================
--- trunk/gui/storage/views.py	2013-01-22 11:47:17 UTC (rev 13083)
+++ trunk/gui/storage/views.py	2013-01-22 12:06:57 UTC (rev 13084)
@@ -132,6 +132,11 @@
         else:
             r = None
 
+    fieldmap = {
+        'used': 'usedb',
+        'refer': 'referb',
+    }
+
     for key in request.GET.keys():
         reg = re.search(r'sort\((?P<sign>.)(?P<field>.+?)\)', key)
         if reg:
@@ -140,6 +145,8 @@
                 rev = True
             else:
                 rev = False
+            field = fieldmap.get(field, field)
+            log.error("filter really by: %s", field)
             if field in zfsnap_list[0]:
                 zfsnap_list.sort(key=lambda item: item[field], reverse=rev)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13092
          http://freenas.svn.sourceforge.net/freenas/?rev=13092&view=rev
Author:   jhixson
Date:     2013-01-22 20:20:17 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
More NT4/NIS goodness.

Modified Paths:
--------------
    trunk/gui/common/freenasldap.py
    trunk/gui/middleware/notifier.py
    trunk/gui/services/models.py
    trunk/gui/services/views.py

Added Paths:
-----------
    trunk/gui/services/migrations/0083_auto__add_field_nt4_nt4_hostname.py
    trunk/gui/services/migrations/0084_auto__del_field_nt4_nt4_hostname__add_field_nt4_nt4_dcname.py

Modified: trunk/gui/common/freenasldap.py
===================================================================
--- trunk/gui/common/freenasldap.py	2013-01-22 20:16:16 UTC (rev 13091)
+++ trunk/gui/common/freenasldap.py	2013-01-22 20:20:17 UTC (rev 13092)
@@ -69,7 +69,7 @@
 FREENAS_AD_LOCAL_GROUPCACHE = os.path.join(FREENAS_AD_LOCALDIR, ".groups")
 
 FREENAS_AD_SEPARATOR = get_freenas_var("FREENAS_AD_SEPARATOR", '\\')
-FREENAS_AD_CONFIG_FILE = get_freenas_var("AD_CONFIG_FILE", "/etc/ActiveDirectory/config")
+FREENAS_AD_CONFIG_FILE = get_freenas_var("AD_CONFIG_FILE", "/etc/directoryservice/ActiveDirectory/config")
 
 FREENAS_LDAP_CACHE_EXPIRE = get_freenas_var("FREENAS_LDAP_CACHE_EXPIRE", 60)
 FREENAS_LDAP_CACHE_ENABLE = get_freenas_var("FREENAS_LDAP_CACHE_ENABLE", 1)

Modified: trunk/gui/middleware/notifier.py
===================================================================
--- trunk/gui/middleware/notifier.py	2013-01-22 20:16:16 UTC (rev 13091)
+++ trunk/gui/middleware/notifier.py	2013-01-22 20:20:17 UTC (rev 13092)
@@ -597,17 +597,25 @@
         self._start_ldap()
 
     def _clear_activedirectory_config(self):
-        self.__system("/bin/rm -f /etc/ActiveDirectory/config")
+        self.__system("/bin/rm -f /etc/directoryservice/ActiveDirectory/config")
 
+    def _started_nt4(self):
+        if self.__system("/etc/directoryservice/NT4/ctl status") == 0:
+            return True
+        else:
+            return False
+
     def _start_nt4(self):
-        log.debug("XXX: _start_nt4")
-        pass
+        log.debug("/etc/directoryservice/NT4/ctl start")
+        self.__system("/etc/directoryservice/NT4/ctl start")
+
     def _restart_nt4(self):
-        log.debug("XXX: _restart_nt4")
-        pass
+        log.debug("/etc/directoryservice/NT4/ctl restart")
+        self.__system("/etc/directoryservice/NT4/ctl restart")
+
     def _stop_nt4(self):
-        log.debug("XXX: _stop_nt4")
-        pass
+        log.debug("/etc/directoryservice/NT4/ctl stop")
+        self.__system("/etc/directoryservice/NT4/ctl stop")
 
     def _started_activedirectory(self):
         from freenasUI.common.freenasldap import (FreeNAS_ActiveDirectory,
@@ -631,13 +639,13 @@
         return ret
 
     def _start_activedirectory(self):
-        self.__system("/etc/ActiveDirectory/ctl start")
+        self.__system("/etc/directoryservice/ActiveDirectory/ctl start")
 
     def _stop_activedirectory(self):
-        self.__system("/etc/ActiveDirectory/ctl stop")
+        self.__system("/etc/directoryservice/ActiveDirectory/ctl stop")
 
     def _restart_activedirectory(self):
-        self.__system("/etc/ActiveDirectory/ctl restart")
+        self.__system("/etc/directoryservice/ActiveDirectory/ctl restart")
 
     def _restart_syslogd(self):
         self.__system("/usr/sbin/service ix-syslogd quietstart")

Added: trunk/gui/services/migrations/0083_auto__add_field_nt4_nt4_hostname.py
===================================================================
--- trunk/gui/services/migrations/0083_auto__add_field_nt4_nt4_hostname.py	                        (rev 0)
+++ trunk/gui/services/migrations/0083_auto__add_field_nt4_nt4_hostname.py	2013-01-22 20:20:17 UTC (rev 13092)
@@ -0,0 +1,359 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'NT4.nt4_hostname'
+        db.add_column('services_nt4', 'nt4_hostname',
+                      self.gf('django.db.models.fields.CharField')(default='', max_length=120, blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'NT4.nt4_hostname'
+        db.delete_column('services_nt4', 'nt4_hostname')
+
+
+    models = {
+        'services.activedirectory': {
+            'Meta': {'object_name': 'ActiveDirectory'},
+            'ad_adminname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_adminpw': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_allow_trusted_doms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ad_dcname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ad_dns_timeout': ('django.db.models.fields.IntegerField', [], {'default': '10'}),
+            'ad_domainname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_gcname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ad_kpwdname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ad_krbname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ad_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_timeout': ('django.db.models.fields.IntegerField', [], {'default': '10'}),
+            'ad_unix_extensions': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ad_use_default_domain': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'ad_verbose_logging': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ad_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.afp': {
+            'Meta': {'object_name': 'AFP'},
+            'afp_srv_connections_limit': ('django.db.models.fields.IntegerField', [], {'default': '50', 'max_length': '120'}),
+            'afp_srv_guest': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'afp_srv_guest_user': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'}),
+            'afp_srv_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.cifs': {
+            'Meta': {'object_name': 'CIFS'},
+            'cifs_srv_aio_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_aio_rs': ('django.db.models.fields.IntegerField', [], {'default': '4096', 'max_length': '120'}),
+            'cifs_srv_aio_ws': ('django.db.models.fields.IntegerField', [], {'default': '4096', 'max_length': '120'}),
+            'cifs_srv_authmodel': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'cifs_srv_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_dirmask': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_dosattr': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_doscharset': ('django.db.models.fields.CharField', [], {'default': "'CP437'", 'max_length': '120'}),
+            'cifs_srv_easupport': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_filemask': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_guest': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'}),
+            'cifs_srv_homedir': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'cifs_srv_homedir_aux': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'cifs_srv_homedir_browseable_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_homedir_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_hostlookup': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cifs_srv_largerw': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_localmaster': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_loglevel': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '120'}),
+            'cifs_srv_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'cifs_srv_nullpw': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_sendfile': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_smb_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'cifs_srv_timeserver': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_unixcharset': ('django.db.models.fields.CharField', [], {'default': "'UTF-8'", 'max_length': '120'}),
+            'cifs_srv_unixext': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cifs_srv_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'cifs_srv_zeroconf': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.dynamicdns': {
+            'Meta': {'object_name': 'DynamicDNS'},
+            'ddns_domain': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_fupdateperiod': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ddns_password': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ddns_provider': ('django.db.models.fields.CharField', [], {'default': "'dyndns'", 'max_length': '120', 'blank': 'True'}),
+            'ddns_updateperiod': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_username': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.ftp': {
+            'Meta': {'object_name': 'FTP'},
+            'ftp_anonpath': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'ftp_anonuserbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_anonuserdlbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_banner': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_clients': ('django.db.models.fields.PositiveIntegerField', [], {'default': '32'}),
+            'ftp_defaultroot': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_dirmask': ('django.db.models.fields.CharField', [], {'default': "'077'", 'max_length': '3'}),
+            'ftp_filemask': ('django.db.models.fields.CharField', [], {'default': "'077'", 'max_length': '3'}),
+            'ftp_fxp': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ident': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ipconnections': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_localuserbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_localuserdlbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_loginattempt': ('django.db.models.fields.PositiveIntegerField', [], {'default': '3'}),
+            'ftp_masqaddress': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_onlyanonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_onlylocal': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_passiveportsmax': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_passiveportsmin': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_port': ('django.db.models.fields.PositiveIntegerField', [], {'default': '21'}),
+            'ftp_resume': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_reversedns': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_rootlogin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ssltls': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ssltls_certfile': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ftp_timeout': ('django.db.models.fields.PositiveIntegerField', [], {'default': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.iscsitarget': {
+            'Meta': {'object_name': 'iSCSITarget'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_alias': ('django.db.models.fields.CharField', [], {'max_length': '120', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'iscsi_target_authgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_target_authtype': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_target_flags': ('django.db.models.fields.CharField', [], {'default': "'rw'", 'max_length': '120'}),
+            'iscsi_target_initialdigest': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_target_initiatorgroup': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetAuthorizedInitiator']"}),
+            'iscsi_target_logical_blocksize': ('django.db.models.fields.IntegerField', [], {'default': '512', 'max_length': '3'}),
+            'iscsi_target_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '120'}),
+            'iscsi_target_portalgroup': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetPortal']"}),
+            'iscsi_target_queue_depth': ('django.db.models.fields.IntegerField', [], {'default': '32', 'max_length': '3'}),
+            'iscsi_target_serial': ('django.db.models.fields.CharField', [], {'default': "'10000001'", 'max_length': '16'}),
+            'iscsi_target_type': ('django.db.models.fields.CharField', [], {'default': "'Disk'", 'max_length': '120'})
+        },
+        'services.iscsitargetauthcredential': {
+            'Meta': {'object_name': 'iSCSITargetAuthCredential'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_auth_peersecret': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_auth_peeruser': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_auth_secret': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_auth_tag': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'iscsi_target_auth_user': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.iscsitargetauthorizedinitiator': {
+            'Meta': {'object_name': 'iSCSITargetAuthorizedInitiator'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_initiator_auth_network': ('django.db.models.fields.TextField', [], {'default': "'ALL'", 'max_length': '2048'}),
+            'iscsi_target_initiator_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_initiator_initiators': ('django.db.models.fields.TextField', [], {'default': "'ALL'", 'max_length': '2048'}),
+            'iscsi_target_initiator_tag': ('django.db.models.fields.IntegerField', [], {'default': '1', 'unique': 'True'})
+        },
+        'services.iscsitargetextent': {
+            'Meta': {'ordering': "['iscsi_target_extent_name']", 'object_name': 'iSCSITargetExtent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_extent_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_extent_filesize': ('django.db.models.fields.CharField', [], {'default': '0', 'max_length': '120'}),
+            'iscsi_target_extent_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '120'}),
+            'iscsi_target_extent_path': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_extent_type': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.iscsitargetglobalconfiguration': {
+            'Meta': {'object_name': 'iSCSITargetGlobalConfiguration'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_basename': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_defaultt2r': ('django.db.models.fields.IntegerField', [], {'default': '60', 'max_length': '120'}),
+            'iscsi_defaultt2w': ('django.db.models.fields.IntegerField', [], {'default': '2', 'max_length': '120'}),
+            'iscsi_discoveryauthgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_discoveryauthmethod': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_firstburst': ('django.db.models.fields.IntegerField', [], {'default': '65536', 'max_length': '120'}),
+            'iscsi_iotimeout': ('django.db.models.fields.IntegerField', [], {'default': '30', 'max_length': '120'}),
+            'iscsi_luc_authgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_luc_authmethod': ('django.db.models.fields.CharField', [], {'default': "'chap'", 'max_length': '120', 'blank': 'True'}),
+            'iscsi_luc_authnetwork': ('django.db.models.fields.CharField', [], {'default': "'127.0.0.0/8'", 'max_length': '120', 'blank': 'True'}),
+            'iscsi_lucip': ('django.db.models.fields.IPAddressField', [], {'default': "'127.0.0.1'", 'max_length': '15', 'null': 'True', 'blank': 'True'}),
+            'iscsi_lucport': ('django.db.models.fields.IntegerField', [], {'default': '3261', 'null': 'True', 'blank': 'True'}),
+            'iscsi_maxburst': ('django.db.models.fields.IntegerField', [], {'default': '262144', 'max_length': '120'}),
+            'iscsi_maxconnect': ('django.db.models.fields.IntegerField', [], {'default': '8', 'max_length': '120'}),
+            'iscsi_maxoutstandingr2t': ('django.db.models.fields.IntegerField', [], {'default': '16', 'max_length': '120'}),
+            'iscsi_maxrecdata': ('django.db.models.fields.IntegerField', [], {'default': '262144', 'max_length': '120'}),
+            'iscsi_maxsesh': ('django.db.models.fields.IntegerField', [], {'default': '16', 'max_length': '120'}),
+            'iscsi_nopinint': ('django.db.models.fields.IntegerField', [], {'default': '20', 'max_length': '120'}),
+            'iscsi_r2t': ('django.db.models.fields.IntegerField', [], {'default': '32', 'max_length': '120'}),
+            'iscsi_toggleluc': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'services.iscsitargetportal': {
+            'Meta': {'object_name': 'iSCSITargetPortal'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_portal_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_portal_tag': ('django.db.models.fields.IntegerField', [], {'default': '1', 'max_length': '120'})
+        },
+        'services.iscsitargetportalip': {
+            'Meta': {'unique_together': "(('iscsi_target_portalip_ip', 'iscsi_target_portalip_port'),)", 'object_name': 'iSCSITargetPortalIP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_portalip_ip': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}),
+            'iscsi_target_portalip_port': ('django.db.models.fields.SmallIntegerField', [], {'default': '3260'}),
+            'iscsi_target_portalip_portal': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetPortal']"})
+        },
+        'services.iscsitargettoextent': {
+            'Meta': {'object_name': 'iSCSITargetToExtent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_extent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetExtent']", 'unique': 'True'}),
+            'iscsi_target': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITarget']"})
+        },
+        'services.ldap': {
+            'Meta': {'object_name': 'LDAP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ldap_anonbind': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ldap_basedn': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_groupsuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_hostname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_machinesuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_passwordsuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_pwencryption': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ldap_rootbasedn': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_rootbindpw': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_ssl': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ldap_tls_cacertfile': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ldap_usersuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+        },
+        'services.nfs': {
+            'Meta': {'object_name': 'NFS'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nfs_srv_allow_nonroot': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'nfs_srv_async': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'nfs_srv_bindip': ('django.db.models.fields.CharField', [], {'max_length': '250', 'blank': 'True'}),
+            'nfs_srv_servers': ('django.db.models.fields.PositiveIntegerField', [], {'default': '4'})
+        },
+        'services.nis': {
+            'Meta': {'object_name': 'NIS'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nis_domain': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.nt4': {
+            'Meta': {'object_name': 'NT4'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nt4_adminname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'nt4_adminpw': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'nt4_hostname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'nt4_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'nt4_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.pluginsjail': {
+            'Meta': {'object_name': 'PluginsJail'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'jail_ipv4address': ('freenasUI.contrib.IPAddressField.IPAddressField', [], {}),
+            'jail_ipv4netmask': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
+            'jail_mac': ('freenasUI.freeadmin.models.MACField', [], {'default': "''", 'max_length': '17', 'blank': 'True'}),
+            'jail_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '120'}),
+            'jail_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'plugins_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'})
+        },
+        'services.rpctoken': {
+            'Meta': {'object_name': 'RPCToken'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'secret': ('django.db.models.fields.CharField', [], {'max_length': '1024'})
+        },
+        'services.rsyncd': {
+            'Meta': {'object_name': 'Rsyncd'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rsyncd_auxiliary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncd_port': ('django.db.models.fields.IntegerField', [], {'default': '873'})
+        },
+        'services.rsyncmod': {
+            'Meta': {'ordering': "['rsyncmod_name']", 'object_name': 'RsyncMod'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rsyncmod_auxiliary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'rsyncmod_group': ('freenasUI.freeadmin.models.GroupField', [], {'default': "'nobody'", 'max_length': '120', 'blank': 'True'}),
+            'rsyncmod_hostsallow': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_hostsdeny': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_maxconn': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'rsyncmod_mode': ('django.db.models.fields.CharField', [], {'default': "'rw'", 'max_length': '120'}),
+            'rsyncmod_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'rsyncmod_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'rsyncmod_user': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120', 'blank': 'True'})
+        },
+        'services.services': {
+            'Meta': {'object_name': 'services'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'srv_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'srv_service': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.smart': {
+            'Meta': {'object_name': 'SMART'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'smart_critical': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_difference': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'smart_informal': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_interval': ('django.db.models.fields.IntegerField', [], {'default': '30'}),
+            'smart_powermode': ('django.db.models.fields.CharField', [], {'default': "'never'", 'max_length': '60'})
+        },
+        'services.snmp': {
+            'Meta': {'object_name': 'SNMP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'snmp_community': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'snmp_contact': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'snmp_location': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'snmp_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'snmp_traps': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'services.ssh': {
+            'Meta': {'object_name': 'SSH'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ssh_compression': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_host_dsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_dsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_ecdsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_ecdsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_rsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_rsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ssh_passwordauth': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_privatekey': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'blank': 'True'}),
+            'ssh_rootlogin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_sftp_log_facility': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'ssh_sftp_log_level': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'ssh_tcpfwd': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_tcpport': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'services.tftp': {
+            'Meta': {'object_name': 'TFTP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'tftp_directory': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'tftp_newfiles': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'tftp_options': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'tftp_port': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'tftp_umask': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'tftp_username': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'})
+        },
+        'services.ups': {
+            'Meta': {'object_name': 'UPS'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ups_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_driver': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_emailnotify': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ups_extrausers': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ups_identifier': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_masterpwd': ('django.db.models.fields.CharField', [], {'default': "'fixmepass'", 'max_length': '30'}),
+            'ups_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ups_port': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_rmonitor': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ups_shutdown': ('django.db.models.fields.CharField', [], {'default': "'batt'", 'max_length': '120'}),
+            'ups_shutdowntimer': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_subject': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_toemail': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['services']
\ No newline at end of file

Added: trunk/gui/services/migrations/0084_auto__del_field_nt4_nt4_hostname__add_field_nt4_nt4_dcname.py
===================================================================
--- trunk/gui/services/migrations/0084_auto__del_field_nt4_nt4_hostname__add_field_nt4_nt4_dcname.py	                        (rev 0)
+++ trunk/gui/services/migrations/0084_auto__del_field_nt4_nt4_hostname__add_field_nt4_nt4_dcname.py	2013-01-22 20:20:17 UTC (rev 13092)
@@ -0,0 +1,367 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'NT4.nt4_hostname'
+        db.delete_column('services_nt4', 'nt4_hostname')
+
+        # Adding field 'NT4.nt4_dcname'
+        db.add_column('services_nt4', 'nt4_dcname',
+                      self.gf('django.db.models.fields.CharField')(default='', max_length=120),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Adding field 'NT4.nt4_hostname'
+        db.add_column('services_nt4', 'nt4_hostname',
+                      self.gf('django.db.models.fields.CharField')(default='', max_length=120, blank=True),
+                      keep_default=False)
+
+        # Deleting field 'NT4.nt4_dcname'
+        db.delete_column('services_nt4', 'nt4_dcname')
+
+
+    models = {
+        'services.activedirectory': {
+            'Meta': {'object_name': 'ActiveDirectory'},
+            'ad_adminname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_adminpw': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_allow_trusted_doms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ad_dcname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ad_dns_timeout': ('django.db.models.fields.IntegerField', [], {'default': '10'}),
+            'ad_domainname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_gcname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ad_kpwdname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ad_krbname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ad_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_timeout': ('django.db.models.fields.IntegerField', [], {'default': '10'}),
+            'ad_unix_extensions': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ad_use_default_domain': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'ad_verbose_logging': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ad_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.afp': {
+            'Meta': {'object_name': 'AFP'},
+            'afp_srv_connections_limit': ('django.db.models.fields.IntegerField', [], {'default': '50', 'max_length': '120'}),
+            'afp_srv_guest': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'afp_srv_guest_user': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'}),
+            'afp_srv_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.cifs': {
+            'Meta': {'object_name': 'CIFS'},
+            'cifs_srv_aio_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_aio_rs': ('django.db.models.fields.IntegerField', [], {'default': '4096', 'max_length': '120'}),
+            'cifs_srv_aio_ws': ('django.db.models.fields.IntegerField', [], {'default': '4096', 'max_length': '120'}),
+            'cifs_srv_authmodel': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'cifs_srv_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_dirmask': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_dosattr': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_doscharset': ('django.db.models.fields.CharField', [], {'default': "'CP437'", 'max_length': '120'}),
+            'cifs_srv_easupport': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_filemask': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_guest': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'}),
+            'cifs_srv_homedir': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'cifs_srv_homedir_aux': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'cifs_srv_homedir_browseable_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_homedir_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_hostlookup': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cifs_srv_largerw': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_localmaster': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_loglevel': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '120'}),
+            'cifs_srv_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'cifs_srv_nullpw': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_sendfile': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_smb_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'cifs_srv_timeserver': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_unixcharset': ('django.db.models.fields.CharField', [], {'default': "'UTF-8'", 'max_length': '120'}),
+            'cifs_srv_unixext': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cifs_srv_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'cifs_srv_zeroconf': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.dynamicdns': {
+            'Meta': {'object_name': 'DynamicDNS'},
+            'ddns_domain': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_fupdateperiod': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ddns_password': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ddns_provider': ('django.db.models.fields.CharField', [], {'default': "'dyndns'", 'max_length': '120', 'blank': 'True'}),
+            'ddns_updateperiod': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_username': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.ftp': {
+            'Meta': {'object_name': 'FTP'},
+            'ftp_anonpath': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'ftp_anonuserbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_anonuserdlbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_banner': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_clients': ('django.db.models.fields.PositiveIntegerField', [], {'default': '32'}),
+            'ftp_defaultroot': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_dirmask': ('django.db.models.fields.CharField', [], {'default': "'077'", 'max_length': '3'}),
+            'ftp_filemask': ('django.db.models.fields.CharField', [], {'default': "'077'", 'max_length': '3'}),
+            'ftp_fxp': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ident': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ipconnections': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_localuserbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_localuserdlbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_loginattempt': ('django.db.models.fields.PositiveIntegerField', [], {'default': '3'}),
+            'ftp_masqaddress': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_onlyanonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_onlylocal': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_passiveportsmax': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_passiveportsmin': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_port': ('django.db.models.fields.PositiveIntegerField', [], {'default': '21'}),
+            'ftp_resume': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_reversedns': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_rootlogin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ssltls': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ssltls_certfile': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ftp_timeout': ('django.db.models.fields.PositiveIntegerField', [], {'default': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.iscsitarget': {
+            'Meta': {'object_name': 'iSCSITarget'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_alias': ('django.db.models.fields.CharField', [], {'max_length': '120', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'iscsi_target_authgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_target_authtype': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_target_flags': ('django.db.models.fields.CharField', [], {'default': "'rw'", 'max_length': '120'}),
+            'iscsi_target_initialdigest': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_target_initiatorgroup': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetAuthorizedInitiator']"}),
+            'iscsi_target_logical_blocksize': ('django.db.models.fields.IntegerField', [], {'default': '512', 'max_length': '3'}),
+            'iscsi_target_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '120'}),
+            'iscsi_target_portalgroup': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetPortal']"}),
+            'iscsi_target_queue_depth': ('django.db.models.fields.IntegerField', [], {'default': '32', 'max_length': '3'}),
+            'iscsi_target_serial': ('django.db.models.fields.CharField', [], {'default': "'10000001'", 'max_length': '16'}),
+            'iscsi_target_type': ('django.db.models.fields.CharField', [], {'default': "'Disk'", 'max_length': '120'})
+        },
+        'services.iscsitargetauthcredential': {
+            'Meta': {'object_name': 'iSCSITargetAuthCredential'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_auth_peersecret': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_auth_peeruser': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_auth_secret': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_auth_tag': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'iscsi_target_auth_user': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.iscsitargetauthorizedinitiator': {
+            'Meta': {'object_name': 'iSCSITargetAuthorizedInitiator'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_initiator_auth_network': ('django.db.models.fields.TextField', [], {'default': "'ALL'", 'max_length': '2048'}),
+            'iscsi_target_initiator_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_initiator_initiators': ('django.db.models.fields.TextField', [], {'default': "'ALL'", 'max_length': '2048'}),
+            'iscsi_target_initiator_tag': ('django.db.models.fields.IntegerField', [], {'default': '1', 'unique': 'True'})
+        },
+        'services.iscsitargetextent': {
+            'Meta': {'ordering': "['iscsi_target_extent_name']", 'object_name': 'iSCSITargetExtent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_extent_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_extent_filesize': ('django.db.models.fields.CharField', [], {'default': '0', 'max_length': '120'}),
+            'iscsi_target_extent_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '120'}),
+            'iscsi_target_extent_path': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_extent_type': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.iscsitargetglobalconfiguration': {
+            'Meta': {'object_name': 'iSCSITargetGlobalConfiguration'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_basename': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_defaultt2r': ('django.db.models.fields.IntegerField', [], {'default': '60', 'max_length': '120'}),
+            'iscsi_defaultt2w': ('django.db.models.fields.IntegerField', [], {'default': '2', 'max_length': '120'}),
+            'iscsi_discoveryauthgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_discoveryauthmethod': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_firstburst': ('django.db.models.fields.IntegerField', [], {'default': '65536', 'max_length': '120'}),
+            'iscsi_iotimeout': ('django.db.models.fields.IntegerField', [], {'default': '30', 'max_length': '120'}),
+            'iscsi_luc_authgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_luc_authmethod': ('django.db.models.fields.CharField', [], {'default': "'chap'", 'max_length': '120', 'blank': 'True'}),
+            'iscsi_luc_authnetwork': ('django.db.models.fields.CharField', [], {'default': "'127.0.0.0/8'", 'max_length': '120', 'blank': 'True'}),
+            'iscsi_lucip': ('django.db.models.fields.IPAddressField', [], {'default': "'127.0.0.1'", 'max_length': '15', 'null': 'True', 'blank': 'True'}),
+            'iscsi_lucport': ('django.db.models.fields.IntegerField', [], {'default': '3261', 'null': 'True', 'blank': 'True'}),
+            'iscsi_maxburst': ('django.db.models.fields.IntegerField', [], {'default': '262144', 'max_length': '120'}),
+            'iscsi_maxconnect': ('django.db.models.fields.IntegerField', [], {'default': '8', 'max_length': '120'}),
+            'iscsi_maxoutstandingr2t': ('django.db.models.fields.IntegerField', [], {'default': '16', 'max_length': '120'}),
+            'iscsi_maxrecdata': ('django.db.models.fields.IntegerField', [], {'default': '262144', 'max_length': '120'}),
+            'iscsi_maxsesh': ('django.db.models.fields.IntegerField', [], {'default': '16', 'max_length': '120'}),
+            'iscsi_nopinint': ('django.db.models.fields.IntegerField', [], {'default': '20', 'max_length': '120'}),
+            'iscsi_r2t': ('django.db.models.fields.IntegerField', [], {'default': '32', 'max_length': '120'}),
+            'iscsi_toggleluc': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'services.iscsitargetportal': {
+            'Meta': {'object_name': 'iSCSITargetPortal'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_portal_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_portal_tag': ('django.db.models.fields.IntegerField', [], {'default': '1', 'max_length': '120'})
+        },
+        'services.iscsitargetportalip': {
+            'Meta': {'unique_together': "(('iscsi_target_portalip_ip', 'iscsi_target_portalip_port'),)", 'object_name': 'iSCSITargetPortalIP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_portalip_ip': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}),
+            'iscsi_target_portalip_port': ('django.db.models.fields.SmallIntegerField', [], {'default': '3260'}),
+            'iscsi_target_portalip_portal': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetPortal']"})
+        },
+        'services.iscsitargettoextent': {
+            'Meta': {'object_name': 'iSCSITargetToExtent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_extent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetExtent']", 'unique': 'True'}),
+            'iscsi_target': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITarget']"})
+        },
+        'services.ldap': {
+            'Meta': {'object_name': 'LDAP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ldap_anonbind': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ldap_basedn': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_groupsuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_hostname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_machinesuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_passwordsuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_pwencryption': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ldap_rootbasedn': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_rootbindpw': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_ssl': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ldap_tls_cacertfile': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ldap_usersuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+        },
+        'services.nfs': {
+            'Meta': {'object_name': 'NFS'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nfs_srv_allow_nonroot': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'nfs_srv_async': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'nfs_srv_bindip': ('django.db.models.fields.CharField', [], {'max_length': '250', 'blank': 'True'}),
+            'nfs_srv_servers': ('django.db.models.fields.PositiveIntegerField', [], {'default': '4'})
+        },
+        'services.nis': {
+            'Meta': {'object_name': 'NIS'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nis_domain': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.nt4': {
+            'Meta': {'object_name': 'NT4'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nt4_adminname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'nt4_adminpw': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'nt4_dcname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'nt4_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'nt4_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.pluginsjail': {
+            'Meta': {'object_name': 'PluginsJail'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'jail_ipv4address': ('freenasUI.contrib.IPAddressField.IPAddressField', [], {}),
+            'jail_ipv4netmask': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
+            'jail_mac': ('freenasUI.freeadmin.models.MACField', [], {'default': "''", 'max_length': '17', 'blank': 'True'}),
+            'jail_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '120'}),
+            'jail_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'plugins_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'})
+        },
+        'services.rpctoken': {
+            'Meta': {'object_name': 'RPCToken'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'secret': ('django.db.models.fields.CharField', [], {'max_length': '1024'})
+        },
+        'services.rsyncd': {
+            'Meta': {'object_name': 'Rsyncd'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rsyncd_auxiliary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncd_port': ('django.db.models.fields.IntegerField', [], {'default': '873'})
+        },
+        'services.rsyncmod': {
+            'Meta': {'ordering': "['rsyncmod_name']", 'object_name': 'RsyncMod'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rsyncmod_auxiliary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'rsyncmod_group': ('freenasUI.freeadmin.models.GroupField', [], {'default': "'nobody'", 'max_length': '120', 'blank': 'True'}),
+            'rsyncmod_hostsallow': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_hostsdeny': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_maxconn': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'rsyncmod_mode': ('django.db.models.fields.CharField', [], {'default': "'rw'", 'max_length': '120'}),
+            'rsyncmod_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'rsyncmod_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'rsyncmod_user': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120', 'blank': 'True'})
+        },
+        'services.services': {
+            'Meta': {'object_name': 'services'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'srv_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'srv_service': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.smart': {
+            'Meta': {'object_name': 'SMART'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'smart_critical': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_difference': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'smart_informal': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_interval': ('django.db.models.fields.IntegerField', [], {'default': '30'}),
+            'smart_powermode': ('django.db.models.fields.CharField', [], {'default': "'never'", 'max_length': '60'})
+        },
+        'services.snmp': {
+            'Meta': {'object_name': 'SNMP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'snmp_community': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'snmp_contact': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'snmp_location': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'snmp_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'snmp_traps': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'services.ssh': {
+            'Meta': {'object_name': 'SSH'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ssh_compression': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_host_dsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_dsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_ecdsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_ecdsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_rsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_rsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ssh_passwordauth': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_privatekey': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'blank': 'True'}),
+            'ssh_rootlogin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_sftp_log_facility': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'ssh_sftp_log_level': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'ssh_tcpfwd': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_tcpport': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'services.tftp': {
+            'Meta': {'object_name': 'TFTP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'tftp_directory': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'tftp_newfiles': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'tftp_options': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'tftp_port': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'tftp_umask': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'tftp_username': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'})
+        },
+        'services.ups': {
+            'Meta': {'object_name': 'UPS'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ups_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_driver': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_emailnotify': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ups_extrausers': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ups_identifier': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_masterpwd': ('django.db.models.fields.CharField', [], {'default': "'fixmepass'", 'max_length': '30'}),
+            'ups_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ups_port': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_rmonitor': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ups_shutdown': ('django.db.models.fields.CharField', [], {'default': "'batt'", 'max_length': '120'}),
+            'ups_shutdowntimer': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_subject': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_toemail': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['services']
\ No newline at end of file

Modified: trunk/gui/services/models.py
===================================================================
--- trunk/gui/services/models.py	2013-01-22 20:16:16 UTC (rev 13091)
+++ trunk/gui/services/models.py	2013-01-22 20:20:17 UTC (rev 13092)
@@ -1368,6 +1368,11 @@
 
 
 class NT4(Model):
+    nt4_dcname = models.CharField(
+            max_length=120,
+            verbose_name=_("Domain Controller"),
+            help_text=_("Hostname of the domain controller to use."),
+            )
     nt4_netbiosname = models.CharField(
             max_length=120,
             verbose_name=_("NetBIOS Name"),

Modified: trunk/gui/services/views.py
===================================================================
--- trunk/gui/services/views.py	2013-01-22 20:16:16 UTC (rev 13091)
+++ trunk/gui/services/views.py	2013-01-22 20:20:17 UTC (rev 13092)
@@ -219,9 +219,17 @@
 
     enabled_svcs = []
     disabled_svcs = []
-    directory_services = ['activedirectory', 'ldap', 'nt4', 'nis']
 
     svc_entry = models.services.objects.get(srv_service=changing_service)
+    if svc_entry.srv_enable:
+        svc_entry.srv_enable = 0
+    else:
+        svc_entry.srv_enable = 1
+
+    if changing_service != 'directoryservice':
+        svc_entry.save()
+
+    directory_services = ['activedirectory', 'ldap', 'nt4', 'nis']
     if changing_service == "directoryservice": 
         directoryservice = DirectoryService.objects.order_by("-id")[0]
        
@@ -230,20 +238,16 @@
                 notifier().stop(svc)
 
         if svc_entry.srv_enable == 1:
+            svc_entry.save()
             started = notifier().start(directoryservice.svc)
             if models.services.objects.get(srv_service='cifs').srv_enable:
                 enabled_svcs.append('cifs')
         else:
             started = notifier().stop(directoryservice.svc)
+            svc_entry.save()
             if not models.services.objects.get(srv_service='cifs').srv_enable:
                 disabled_svcs.append('cifs')
 
-    if svc_entry.srv_enable:
-        svc_entry.srv_enable = 0
-    else:
-        svc_entry.srv_enable = 1
-    svc_entry.save()
-
     if changing_service != 'directoryservice':
         started = notifier().restart(changing_service)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13106
          http://freenas.svn.sourceforge.net/freenas/?rev=13106&view=rev
Author:   zippybr
Date:     2013-01-23 13:42:20 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
Add a REST resource for ZFS snapshots

Modified Paths:
--------------
    trunk/gui/freeadmin/api/resources.py
    trunk/gui/freeadmin/site.py
    trunk/gui/middleware/zfs.py

Modified: trunk/gui/freeadmin/api/resources.py
===================================================================
--- trunk/gui/freeadmin/api/resources.py	2013-01-23 13:42:06 UTC (rev 13105)
+++ trunk/gui/freeadmin/api/resources.py	2013-01-23 13:42:20 UTC (rev 13106)
@@ -46,6 +46,7 @@
 from freenasUI.sharing.models import NFS_Share
 from freenasUI.system.models import CronJob, Rsync, SMARTTest
 from freenasUI.storage.models import Disk, Replication, Scrub, Task, Volume
+from tastypie import fields
 
 import logging
 
@@ -870,3 +871,42 @@
         })
 
         return bundle
+
+
+class SnapshotResource(DojoResource):
+
+    name = fields.CharField(attribute='name')
+    fullname = fields.CharField(attribute='fullname')
+    refer = fields.CharField(attribute='refer')
+    used = fields.CharField(attribute='used')
+    mostrecent = fields.BooleanField(attribute='mostrecent')
+    parent_type = fields.CharField(attribute='parent_type')
+
+    class Meta:
+        resource_name = 'snapshot'
+        include_resource_uri = False
+        authentication = DjangoAuthentication()
+        object_class = zfs.Snapshot
+
+    def obj_get_list(self, request=None, **kwargs):
+        snapshots = notifier().zfs_snapshot_list()
+        results = []
+        for fs, snaps in snapshots.items():
+            for snap in snaps:
+                results.append(zfs.Snapshot(
+                    name=snap['name'],
+                    filesystem=fs,
+                    used=snap['used'],
+                    refer=snap['refer'],
+                    mostrecent=snap['mostrecent'],
+                    parent_type=snap['parent']
+                ))
+        for sfield in self._apply_sorting(request.GET):
+            if sfield.startswith('-'):
+                field = sfield[1:]
+                reverse = True
+            else:
+                field = sfield
+                reverse = False
+            results.sort(key=lambda item: getattr(item, field), reverse=reverse)
+        return results

Modified: trunk/gui/freeadmin/site.py
===================================================================
--- trunk/gui/freeadmin/site.py	2013-01-23 13:42:06 UTC (rev 13105)
+++ trunk/gui/freeadmin/site.py	2013-01-23 13:42:20 UTC (rev 13106)
@@ -5,6 +5,7 @@
 import os
 import re
 
+from django.conf.urls import patterns, url, include
 from django.core.urlresolvers import reverse
 from django.db.models.base import ModelBase
 from django.http import HttpResponse, HttpResponseRedirect
@@ -21,6 +22,7 @@
 RE_ALERT = re.compile(r'^(?P<status>\w+)\[(?P<msgid>.+?)\]: (?P<message>.+)')
 log = logging.getLogger('freeadmin.site')
 
+
 class NotRegistered(Exception):
     pass
 
@@ -142,8 +144,10 @@
         return update_wrapper(inner, view)
 
     def get_urls(self):
-        from django.conf.urls import patterns, url, include
+        from freenasUI.freeadmin.api.resources import SnapshotResource
 
+        self.v1_api.register(SnapshotResource())
+
         def wrap(view, cacheable=False):
             def wrapper(*args, **kwargs):
                 return self.admin_view(view, cacheable)(*args, **kwargs)

Modified: trunk/gui/middleware/zfs.py
===================================================================
--- trunk/gui/middleware/zfs.py	2013-01-23 13:42:06 UTC (rev 13105)
+++ trunk/gui/middleware/zfs.py	2013-01-23 13:42:20 UTC (rev 13106)
@@ -519,6 +519,44 @@
     used_si = property(_get_used_si)
 
 
+class Snapshot(object):
+
+    name = None
+    filesystem = None
+    used = None
+    refer = None
+    mostrecent = False
+    parent_type = None
+
+    def __init__(
+        self,
+        name,
+        filesystem,
+        used,
+        refer,
+        mostrecent=False,
+        parent_type=None
+    ):
+        self.name = name
+        self.filesystem = filesystem
+        self.used = used
+        self.refer = refer
+        self.mostrecent = mostrecent
+        self.parent_type = parent_type
+
+    @property
+    def fullname(self):
+        return "%s@..." % (self.filesystem, self.name)
+
+    @property
+    def used_bytes(self):
+        return 0
+
+    @property
+    def refer_bytes(self):
+        return 0
+
+
 def parse_status(name, doc, data):
 
     scrub = re.search(r'scrub: (.+)$', data, re.M)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13109
          http://freenas.svn.sourceforge.net/freenas/?rev=13109&view=rev
Author:   zippybr
Date:     2013-01-23 15:01:17 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
Use snapshot rest resource as datagrid source

Modified Paths:
--------------
    trunk/gui/freeadmin/api/resources.py
    trunk/gui/templates/storage/snapshots.html

Modified: trunk/gui/freeadmin/api/resources.py
===================================================================
--- trunk/gui/freeadmin/api/resources.py	2013-01-23 15:00:32 UTC (rev 13108)
+++ trunk/gui/freeadmin/api/resources.py	2013-01-23 15:01:17 UTC (rev 13109)
@@ -24,6 +24,9 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 #####################################################################
+import json
+import logging
+
 from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.utils.translation import ugettext as _
@@ -48,8 +51,6 @@
 from freenasUI.storage.models import Disk, Replication, Scrub, Task, Volume
 from tastypie import fields
 
-import logging
-
 log = logging.getLogger('freeadmin.api.resources')
 
 
@@ -875,7 +876,9 @@
 
 class SnapshotResource(DojoResource):
 
+    id = fields.CharField(attribute='filesystem')
     name = fields.CharField(attribute='name')
+    filesystem = fields.CharField(attribute='filesystem')
     fullname = fields.CharField(attribute='fullname')
     refer = fields.CharField(attribute='refer')
     used = fields.CharField(attribute='used')
@@ -908,5 +911,25 @@
             else:
                 field = sfield
                 reverse = False
-            results.sort(key=lambda item: getattr(item, field), reverse=reverse)
+            results.sort(
+                key=lambda item: getattr(item, field),
+                reverse=reverse)
         return results
+
+    def dehydrate(self, bundle):
+        bundle.data['extra'] = {
+            'clone_url': reverse(
+                'storage_clonesnap',
+                kwargs={
+                    'snapshot': bundle.obj.fullname,
+                }),
+            'rollback_url': reverse('storage_snapshot_rollback', kwargs={
+                'dataset': bundle.obj.filesystem,
+                'snapname': bundle.obj.name,
+            }) if bundle.obj.mostrecent else None,
+            'delete_url': reverse('storage_snapshot_delete', kwargs={
+                'dataset': bundle.obj.filesystem,
+                'snapname': bundle.obj.name,
+            }),
+        }
+        return bundle

Modified: trunk/gui/templates/storage/snapshots.html
===================================================================
--- trunk/gui/templates/storage/snapshots.html	2013-01-23 15:00:32 UTC (rev 13108)
+++ trunk/gui/templates/storage/snapshots.html	2013-01-23 15:01:17 UTC (rev 13109)
@@ -2,54 +2,68 @@
 <div data-dojo-type="dijit.layout.ContentPane" id="datagrid" data-dojo-props="region: 'center'" style="height:100%; width:100%;">
 <script type="dojo/method">
 
-    function acts(v) {
-        var json = dojo.fromJson(v);
-        var content = new dijit.layout.ContentPane({});
-
+  var me = this;
+  require([
+  "dojo/on",
+  "dojo/store/JsonRest",
+  "dojo/data/ObjectStore",
+  "dijit/registry",
+  "dijit/Tooltip",
+  "dijit/form/Button",
+  "dijit/layout/ContentPane",
+  "dojox/grid/EnhancedGrid"
+  ], function(
+  on,
+  JsonRest,
+  ObjectStore,
+  registry,
+  Tooltip,
+  Button,
+  ContentPane,
+  EnhancedGrid) {
+    function acts(json) {
+        var content = new ContentPane({});
         if(json['clone_url']) {
-            var b = new dijit.form.Button({
+            var b = new Button({
                 label: '<img src="{{ STATIC_URL }}images/ui/buttons/clone_snapshot.png">',
             });
-            dojo.require("dijit.Tooltip");
-            new dijit.Tooltip({
+            new Tooltip({
                connectId: [b.domNode],
-               label: "{% trans "Clone Snapshot"|force_escape %}",
+               label: "{% trans "Clone Snapshot"|escapejs %}",
                position: ['above'],
             });
             content.domNode.appendChild(b.domNode);
-            dojo.connect(b, 'onClick', function() {
+            on(b, 'click', function() {
                 editObject('{% trans "Clone snapshot"|force_escape|force_escape %}', json['clone_url'], [this,]);
             });
         }
 
         if(json['delete_url']) {
-            var b = new dijit.form.Button({
+            var b = new Button({
                 label: '<img src="{{ STATIC_URL }}images/ui/buttons/remove_snapshot.png">',
             });
-            dojo.require("dijit.Tooltip");
-            new dijit.Tooltip({
+            new Tooltip({
                connectId: [b.domNode],
-               label: "{% trans "Destroy Snapshot"|force_escape %}",
+               label: "{% trans "Destroy Snapshot"|escapejs %}",
                position: ['above'],
             });
             content.domNode.appendChild(b.domNode);
-            dojo.connect(b, 'onClick', function() {
+            on(b, 'click', function() {
                 editObject('{% trans "Destroy this snapshot"|force_escape|force_escape %}', json['delete_url'], [this,]);
             });
         }
 
         if(json['rollback_url']) {
-            var b = new dijit.form.Button({
+            var b = new Button({
                 label: '<img src="{{ STATIC_URL }}images/ui/buttons/rollback_snapshot.png">',
             });
-            dojo.require("dijit.Tooltip");
-            new dijit.Tooltip({
+            new Tooltip({
                connectId: [b.domNode],
-               label: "{% trans "Rollback Snapshot"|force_escape %}",
+               label: "{% trans "Rollback Snapshot"|escapejs %}",
                position: ['above'],
             });
             content.domNode.appendChild(b.domNode);
-            dojo.connect(b, 'onClick', function() {
+            on(b, 'click', function() {
                 editObject('{% trans "Rollback to this snapshot"|force_escape|force_escape %}', json['rollback_url'], [this,]);
             });
         }
@@ -57,10 +71,10 @@
         return content;
     }
 
-    var store = new dojox.data.JsonRestStore({
-        target: "{% url storage_snapshots_data %}",
-        idAttribute:"id",
-        });
+    var objectStore = new JsonRest({
+      target: "{% url api_dispatch_list api_name="v1.0" resource_name="snapshot" %}"
+    });
+    var store = new ObjectStore({objectStore: objectStore});
 
     var struc = [
     {
@@ -92,10 +106,10 @@
     },
     ];
 
-    var vd = dijit.byId("viewdatagrid");
+    var vd = registry.byId("viewdatagrid");
     if (vd) vd.destroy();
 
-    var grid4 = new dojox.grid.EnhancedGrid({
+    var grid4 = new EnhancedGrid({
         query: {},
         store: store,
         id: 'viewdatagrid',
@@ -108,16 +122,18 @@
             indirectSelection: true,
             filter: {
                 isServerSide: false,
-                },
             },
+        },
         structure: struc
     });
 
     // append the new grid to the div "gridContainer4":
-    this.domNode.appendChild(grid4.domNode);
+    me.domNode.appendChild(grid4.domNode);
 
     // Call startup, in order to render the grid:
     grid4.startup();
+
+  });
 </script>
 </div>
 <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region: 'bottom'" style="height:62px;">
@@ -126,26 +142,37 @@
         <p>{% trans "Destroy" %}</p>
 
         <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
-            dg = dijit.byId('viewdatagrid');
+          var me = this;
+          require([
+          "dojo/_base/array",
+          "dijit/registry",
+          "dojo/cookie",
+          "dojo/request/xhr"
+          ], function(
+          darray,
+          registry,
+          cookie,
+          xhr) {
+            dg = registry.byId('viewdatagrid');
             var snaps = [];
-            dojo.forEach(dg.selection.getSelected(), function(item, idx) {
+            darray.forEach(dg.selection.getSelected(), function(item, idx) {
                 snaps.push(item['fullname']);
             });
+            console.log(snaps);
             if(snaps.length == 0) return true;
 
-            editObject('{% trans "Delete snapshots"|escapejs %}', null, [this], function(data) {
+            editObject('{% trans "Delete snapshots"|escapejs %}', null, [me], function(data) {
                 var dialog = this;
-                dojo.xhrPost({
-                    url: '{% url storage_snapshot_delete_bulk %}',
-                    content: {snaps: snaps.join("|")},
-                    handleAs: "text",
-                    sync: true,
-                    headers: {"X-CSRFToken": dojo.cookie('csrftoken')},
-                    load: function(data){
-                        dialog.set('content', data);
-                    },
+                xhr.post('{% url storage_snapshot_delete_bulk %}', {
+                  data: {snaps: snaps.join("|")},
+                  handleAs: "text",
+                  sync: true,
+                  headers: {"X-CSRFToken": dojo.cookie('csrftoken')},
+                }).then(function(data){
+                     dialog.set('content', data);
                 });
             });
+          });
         </script>
     </button>
 </div>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13111
          http://freenas.svn.sourceforge.net/freenas/?rev=13111&view=rev
Author:   zippybr
Date:     2013-01-23 15:16:29 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
Fix sort by used/refer

Modified Paths:
--------------
    trunk/gui/freeadmin/api/resources.py
    trunk/gui/middleware/notifier.py
    trunk/gui/middleware/zfs.py

Modified: trunk/gui/freeadmin/api/resources.py
===================================================================
--- trunk/gui/freeadmin/api/resources.py	2013-01-23 15:03:23 UTC (rev 13110)
+++ trunk/gui/freeadmin/api/resources.py	2013-01-23 15:16:29 UTC (rev 13111)
@@ -904,6 +904,11 @@
                     mostrecent=snap['mostrecent'],
                     parent_type=snap['parent']
                 ))
+        FIELD_MAP = {
+            'used': 'used_bytes',
+            'refer': 'refer_bytes',
+            'extra': 'mostrecent',
+        }
         for sfield in self._apply_sorting(request.GET):
             if sfield.startswith('-'):
                 field = sfield[1:]
@@ -911,6 +916,7 @@
             else:
                 field = sfield
                 reverse = False
+            field = FIELD_MAP.get(field, field)
             results.sort(
                 key=lambda item: getattr(item, field),
                 reverse=reverse)

Modified: trunk/gui/middleware/notifier.py
===================================================================
--- trunk/gui/middleware/notifier.py	2013-01-23 15:03:23 UTC (rev 13110)
+++ trunk/gui/middleware/notifier.py	2013-01-23 15:16:29 UTC (rev 13111)
@@ -35,7 +35,6 @@
 """
 
 from collections import OrderedDict
-from decimal import Decimal
 import ctypes
 import errno
 import glob
@@ -3311,18 +3310,6 @@
             raise MiddlewareError('Unable to scrub %s: %s' % (name, stderr))
         return True
 
-    def _zfs_size_to_bytes(self, size):
-        if 'K' in size:
-            return Decimal(size.replace('K', '')) * 1024
-        elif 'M' in size:
-            return Decimal(size.replace('M', '')) * 1048576
-        elif 'G' in size:
-            return Decimal(size.replace('G', '')) * 1073741824
-        elif 'T' in size:
-            return Decimal(size.replace('T', '')) * 1099511627776
-        else:
-            return size
-
     def zfs_snapshot_list(self, path=None):
         fsinfo = dict()
 
@@ -3352,9 +3339,7 @@
                         ('fullname', snapname),
                         ('name', name),
                         ('used', used),
-                        ('usedb', float(self._zfs_size_to_bytes(used))),
                         ('refer', refer),
-                        ('referb', float(self._zfs_size_to_bytes(refer))),
                         ('mostrecent', mostrecent),
                         ('parent', 'filesystem' if fs not in zvols else 'volume'),
                         ]))

Modified: trunk/gui/middleware/zfs.py
===================================================================
--- trunk/gui/middleware/zfs.py	2013-01-23 15:03:23 UTC (rev 13110)
+++ trunk/gui/middleware/zfs.py	2013-01-23 15:16:29 UTC (rev 13111)
@@ -24,6 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
+from decimal import Decimal
 import logging
 import os
 import re
@@ -58,6 +59,19 @@
     return False
 
 
+def zfs_size_to_bytes(size):
+    if 'K' in size:
+        return Decimal(size.replace('K', '')) * 1024
+    elif 'M' in size:
+        return Decimal(size.replace('M', '')) * 1048576
+    elif 'G' in size:
+        return Decimal(size.replace('G', '')) * 1073741824
+    elif 'T' in size:
+        return Decimal(size.replace('T', '')) * 1099511627776
+    else:
+        return size
+
+
 class Pool(object):
     """
     Class representing a Zpool
@@ -550,11 +564,11 @@
 
     @property
     def used_bytes(self):
-        return 0
+        return zfs_size_to_bytes(self.used)
 
     @property
     def refer_bytes(self):
-        return 0
+        return zfs_size_to_bytes(self.refer)
 
 
 def parse_status(name, doc, data):

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13113
          http://freenas.svn.sourceforge.net/freenas/?rev=13113&view=rev
Author:   zippybr
Date:     2013-01-23 16:55:26 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
zfs_snapshot_list now returns snapshots as Snapshot object

Modified Paths:
--------------
    trunk/gui/freeadmin/api/resources.py
    trunk/gui/middleware/notifier.py
    trunk/gui/services/forms.py

Modified: trunk/gui/freeadmin/api/resources.py
===================================================================
--- trunk/gui/freeadmin/api/resources.py	2013-01-23 15:41:27 UTC (rev 13112)
+++ trunk/gui/freeadmin/api/resources.py	2013-01-23 16:55:26 UTC (rev 13113)
@@ -894,16 +894,8 @@
     def obj_get_list(self, request=None, **kwargs):
         snapshots = notifier().zfs_snapshot_list()
         results = []
-        for fs, snaps in snapshots.items():
-            for snap in snaps:
-                results.append(zfs.Snapshot(
-                    name=snap['name'],
-                    filesystem=fs,
-                    used=snap['used'],
-                    refer=snap['refer'],
-                    mostrecent=snap['mostrecent'],
-                    parent_type=snap['parent']
-                ))
+        for snaps in snapshots.values():
+            results.extend(snaps)
         FIELD_MAP = {
             'used': 'used_bytes',
             'refer': 'refer_bytes',

Modified: trunk/gui/middleware/notifier.py
===================================================================
--- trunk/gui/middleware/notifier.py	2013-01-23 15:41:27 UTC (rev 13112)
+++ trunk/gui/middleware/notifier.py	2013-01-23 16:55:26 UTC (rev 13113)
@@ -3335,14 +3335,14 @@
                     snaplist = []
                     mostrecent = True
                 snaplist.insert(0,
-                    dict([
-                        ('fullname', snapname),
-                        ('name', name),
-                        ('used', used),
-                        ('refer', refer),
-                        ('mostrecent', mostrecent),
-                        ('parent', 'filesystem' if fs not in zvols else 'volume'),
-                        ]))
+                    zfs.Snapshot(
+                        name=name,
+                        filesystem=fs,
+                        used=used,
+                        refer=refer,
+                        mostrecent=mostrecent,
+                        parent_type='filesystem' if fs not in zvols else 'volume'
+                    ))
                 fsinfo[fs] = snaplist
         return fsinfo
 

Modified: trunk/gui/services/forms.py
===================================================================
--- trunk/gui/services/forms.py	2013-01-23 15:41:27 UTC (rev 13112)
+++ trunk/gui/services/forms.py	2013-01-23 16:55:26 UTC (rev 13113)
@@ -942,8 +942,8 @@
                 if not zsnapshots:
                     continue
                 for snap in zsnapshots[0]:
-                    diskchoices["zvol/" + snap['fullname']] = "%s (%s)" % (
-                        snap['fullname'],
+                    diskchoices["zvol/" + snap.fullname] = "%s (%s)" % (
+                        snap.fullname,
                         attrs['volsize'])
 
         # Grab partition list

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13133
          http://freenas.svn.sourceforge.net/freenas/?rev=13133&view=rev
Author:   zippybr
Date:     2013-01-24 12:12:16 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
Allow volume to be unlocked using recovery key

Modified Paths:
--------------
    trunk/gui/middleware/notifier.py
    trunk/gui/storage/forms.py
    trunk/gui/storage/views.py

Modified: trunk/gui/middleware/notifier.py
===================================================================
--- trunk/gui/middleware/notifier.py	2013-01-24 08:56:49 UTC (rev 13132)
+++ trunk/gui/middleware/notifier.py	2013-01-24 12:12:16 UTC (rev 13133)
@@ -1216,27 +1216,28 @@
             return True
         return False
 
-    def geli_attach(self, volume, passphrase=None):
+    def geli_attach(self, volume, passphrase=None, key=None):
         """
         Attach geli providers of a given volume
 
         Returns the number of providers that failed to attach
         """
         failed = 0
-        geli_keyfile = volume.get_geli_keyfile()
+        if key is None:
+            geli_keyfile = volume.get_geli_keyfile()
+        else:
+            geli_keyfile = key
+        if not passphrase:
+            _passphrase = "-p"
+        else:
+            _passphrase = "-j %s" % passphrase
         for ed in volume.encrypteddisk_set.all():
             dev = ed.encrypted_provider
-            if passphrase is None:
-                proc = self.__pipeopen("geli attach -p -k %s %s" % (
-                    geli_keyfile,
-                    dev,
-                    ))
-            else:
-                proc = self.__pipeopen("geli attach -k %s -j %s %s" % (
-                    geli_keyfile,
-                    passphrase,
-                    dev,
-                    ))
+            proc = self.__pipeopen("geli attach %s -k %s %s" % (
+                _passphrase,
+                geli_keyfile,
+                dev,
+            ))
             err = proc.communicate()[1]
             if proc.returncode != 0:
                 log.warn("Failed to geli attach %s: %s", dev, err)

Modified: trunk/gui/storage/forms.py
===================================================================
--- trunk/gui/storage/forms.py	2013-01-24 08:56:49 UTC (rev 13132)
+++ trunk/gui/storage/forms.py	2013-01-24 12:12:16 UTC (rev 13133)
@@ -1816,7 +1816,12 @@
     passphrase = forms.CharField(
         label=_("Passphrase"),
         widget=forms.widgets.PasswordInput(),
-        )
+        required=False,
+    )
+    key = FileField(
+        label=_("Recovery Key"),
+        required=False,
+    )
     services = forms.MultipleChoiceField(
         label=_("Restart services"),
         widget=forms.widgets.CheckboxSelectMultiple(),
@@ -1831,13 +1836,36 @@
         required=False,
     )
 
+    def clean(self):
+        passphrase = self.cleaned_data.get("passphrase")
+        key = self.cleaned_data.get("key")
+        log.error("%r", key)
+        if not passphrase and key is None:
+            self._errors['__all__'] = self.error_class([
+                _("You need either a passphrase or a recovery key to unlock")
+            ])
+        return self.cleaned_data
+
     def done(self, volume):
         passphrase = self.cleaned_data.get("passphrase")
-        passfile = tempfile.mktemp(dir='/tmp/')
-        with open(passfile, 'w') as f:
-            f.write(passphrase)
-        failed = notifier().geli_attach(volume, passfile)
-        os.unlink(passfile)
+        key = self.cleaned_data.get("key")
+        if passphrase:
+            passfile = tempfile.mktemp(dir='/tmp/')
+            with open(passfile, 'w') as f:
+                f.write(passphrase)
+            failed = notifier().geli_attach(volume, passphrase=passfile)
+            os.unlink(passfile)
+        elif key is not None:
+            keyfile = tempfile.mktemp(dir='/tmp/')
+            with open(keyfile, 'wb') as f:
+                f.write(key.read())
+            failed = notifier().geli_attach(
+                volume,
+                passphrase=None,
+                key=keyfile)
+            os.unlink(keyfile)
+        else:
+            raise ValueError("Need a passphrase or recovery key")
         zimport = notifier().zfs_import(volume.vol_name, id=volume.vol_guid)
         if not zimport:
             if failed > 0:

Modified: trunk/gui/storage/views.py
===================================================================
--- trunk/gui/storage/views.py	2013-01-24 08:56:49 UTC (rev 13132)
+++ trunk/gui/storage/views.py	2013-01-24 12:12:16 UTC (rev 13133)
@@ -832,12 +832,14 @@
         })
 
     if request.method == "POST":
-        form = forms.UnlockPassphraseForm(request.POST)
+        form = forms.UnlockPassphraseForm(request.POST, request.FILES)
         if form.is_valid():
             form.done(volume=volume)
             return JsonResp(
                 request,
                 message=_("Volume unlocked"))
+        else:
+            return JsonResp(request, form=form)
     else:
         form = forms.UnlockPassphraseForm()
     return render(request, "storage/unlock_passphrase.html", {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13135
          http://freenas.svn.sourceforge.net/freenas/?rev=13135&view=rev
Author:   zippybr
Date:     2013-01-24 16:09:16 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
Fix issue of resetting recovery key while rekeying and recovery key on change passphrase

Also warning about remove of recovery key on create passphrase

Modified Paths:
--------------
    trunk/gui/middleware/notifier.py
    trunk/gui/storage/forms.py
    trunk/gui/templates/storage/create_passphrase.html

Modified: trunk/gui/middleware/notifier.py
===================================================================
--- trunk/gui/middleware/notifier.py	2013-01-24 12:15:17 UTC (rev 13134)
+++ trunk/gui/middleware/notifier.py	2013-01-24 16:09:16 UTC (rev 13135)
@@ -1074,7 +1074,7 @@
 
         return ("/dev/%s.eli" % devname)
 
-    def geli_passphrase(self, volume, passphrase):
+    def geli_passphrase(self, volume, passphrase, rmrecovery=False):
         """
         Set a passphrase in a geli
         If passphrase is None then remove the passphrase
@@ -1083,28 +1083,29 @@
             MiddlewareError
         """
         geli_keyfile = volume.get_geli_keyfile()
+        if passphrase:
+            _passphrase = "-J %s" % (passphrase, )
+        else:
+            _passphrase = "-P"
         for ed in volume.encrypteddisk_set.all():
             dev = ed.encrypted_provider
-            if passphrase is not None:
-                proc = self.__pipeopen("geli setkey -k %s -K %s -J %s %s" % (
-                    geli_keyfile,
-                    geli_keyfile,
-                    passphrase,
-                    dev,
-                    )
-                    )
-            else:
-                proc = self.__pipeopen("geli setkey -k %s -K %s -P %s" % (
-                    geli_keyfile,
-                    geli_keyfile,
-                    dev,
-                    )
-                    )
+            """
+            A new passphrase cannot be set without destroying the recovery key
+            """
+            if rmrecovery is True:
+                proc = self.__pipeopen("geli delkey -n 1 %s" % (dev, ))
+                proc.communicate()
+            proc = self.__pipeopen("geli setkey -n 0 %s -K %s %s" % (
+                _passphrase,
+                geli_keyfile,
+                dev,
+                )
+            )
             err = proc.communicate()[1]
             if proc.returncode != 0:
                 raise MiddlewareError("Unable to set passphrase: %s" % (err, ))
 
-    def geli_rekey(self, volume, passphrase):
+    def geli_rekey(self, volume, passphrase=None, slot=0):
         """
         Regenerates the geli global key and set it to devs
 
@@ -1119,18 +1120,18 @@
         error = False
         applied = []
         if passphrase:
-            passphrase = "-J %s" % (passphrase, )
+            _passphrase = "-J %s" % (passphrase, )
         else:
-            passphrase = "-P"
+            _passphrase = "-P"
         for ed in volume.encrypteddisk_set.all():
             dev = ed.encrypted_provider
-            proc = self.__pipeopen("geli setkey %s -k %s -K %s.tmp %s" % (
-                passphrase,
+            proc = self.__pipeopen("geli setkey %s -n %d -K %s.tmp %s" % (
+                _passphrase,
+                slot,
                 geli_keyfile,
-                geli_keyfile,
                 dev,
                 )
-                )
+            )
             err = proc.communicate()[1]
             if proc.returncode != 0:
                 error = True
@@ -1141,13 +1142,14 @@
         # If rekey failed for one of the devs, revert for the ones already applied
         if error:
             for dev in applied:
-                proc = self.__pipeopen("geli setkey %s -k %s.tmp -K %s %s" % (
-                    passphrase,
+                proc = self.__pipeopen("geli setkey %s -n %d -k %s.tmp -K %s %s" % (
+                    _passphrase,
+                    slot,
                     geli_keyfile,
                     geli_keyfile,
                     dev,
                     )
-                    )
+                )
                 proc.communicate()
             raise MiddlewareError("Unable to set key: %s" % (err, ))
         else:

Modified: trunk/gui/storage/forms.py
===================================================================
--- trunk/gui/storage/forms.py	2013-01-24 12:15:17 UTC (rev 13134)
+++ trunk/gui/storage/forms.py	2013-01-24 16:09:16 UTC (rev 13135)
@@ -1726,7 +1726,7 @@
                 f.write(passphrase)
         else:
             passfile = None
-        notifier().geli_passphrase(volume, passfile)
+        notifier().geli_passphrase(volume, passfile, rmrecovery=True)
         if passfile is not None:
             os.unlink(passfile)
         volume.vol_encrypt = 2

Modified: trunk/gui/templates/storage/create_passphrase.html
===================================================================
--- trunk/gui/templates/storage/create_passphrase.html	2013-01-24 12:15:17 UTC (rev 13134)
+++ trunk/gui/templates/storage/create_passphrase.html	2013-01-24 16:09:16 UTC (rev 13135)
@@ -1 +1,9 @@
 {% extends "freeadmin/generic_form.html" %}
+{% block form %}
+    <tr>
+        <td colspan="2">
+        <p style="color: red">Warning: this operation will remove the recovery key</p>
+        </td>
+    </tr>
+{{ block.super }}
+{% endblock %}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13146
          http://freenas.svn.sourceforge.net/freenas/?rev=13146&view=rev
Author:   jhixson
Date:     2013-01-25 05:35:39 +0000 (Fri, 25 Jan 2013)
Log Message:
-----------
Start of NT4 class, move cache classes to freenascache, move directory enabled functions to system, modify code accordinly to work with new locations

Modified Paths:
--------------
    trunk/gui/account/views.py
    trunk/gui/common/freenascache.py
    trunk/gui/common/freenasldap.py
    trunk/gui/common/freenasusers.py
    trunk/gui/common/system.py
    trunk/gui/freeadmin/forms.py
    trunk/gui/middleware/notifier.py
    trunk/gui/tools/cachetool.py

Added Paths:
-----------
    trunk/gui/common/freenasnt4.py

Modified: trunk/gui/account/views.py
===================================================================
--- trunk/gui/account/views.py	2013-01-25 03:51:04 UTC (rev 13145)
+++ trunk/gui/account/views.py	2013-01-25 05:35:39 UTC (rev 13146)
@@ -35,7 +35,8 @@
 from django.contrib.auth.forms import AuthenticationForm
 
 from freenasUI.account import forms, models
-from freenasUI.common.freenasldap import (FLAGS_DBINIT, FLAGS_CACHE_READ_USER,
+from freenasUI.common.freenasldap import FLAGS_DBINIT
+from freenasUI.common.freenascache import (FLAGS_CACHE_READ_USER,
     FLAGS_CACHE_WRITE_USER, FLAGS_CACHE_READ_GROUP, FLAGS_CACHE_WRITE_GROUP)
 from freenasUI.common.freenasusers import FreeNAS_Users, FreeNAS_Groups
 from freenasUI.common.system import get_sw_login_version, get_sw_name

Modified: trunk/gui/common/freenascache.py
===================================================================
--- trunk/gui/common/freenascache.py	2013-01-25 03:51:04 UTC (rev 13145)
+++ trunk/gui/common/freenascache.py	2013-01-25 05:35:39 UTC (rev 13146)
@@ -30,14 +30,41 @@
 import logging
 
 from bsddb3 import db
-from freenasUI.common.system import get_freenas_var
+from freenasUI.common.system import get_freenas_var, \
+    ldap_enabled, activedirectory_enabled, nt4_enabled
 
 log = logging.getLogger('common.frenascache')
 
 FREENAS_CACHEDIR = get_freenas_var("FREENAS_CACHEDIR", "/var/tmp/.cache")
 FREENAS_CACHEEXPIRE = int(get_freenas_var("FREENAS_CACHEEXPIRE", 60))
 
+FREENAS_USERCACHE = os.path.join(FREENAS_CACHEDIR, ".users")
+FREENAS_GROUPCACHE = os.path.join(FREENAS_CACHEDIR, ".groups")
 
+FREENAS_LDAP_CACHEROOT = os.path.join(FREENAS_CACHEDIR, ".ldap")
+FREENAS_LDAP_QUERYCACHE = os.path.join(FREENAS_CACHEDIR, ".query")
+
+FREENAS_LDAP_CACHEDIR = os.path.join(FREENAS_LDAP_CACHEROOT, ".ldap")
+FREENAS_LDAP_USERCACHE = os.path.join(FREENAS_LDAP_CACHEDIR, ".users")
+FREENAS_LDAP_GROUPCACHE = os.path.join(FREENAS_LDAP_CACHEDIR, ".groups")
+FREENAS_LDAP_LOCALDIR = os.path.join(FREENAS_LDAP_CACHEDIR, ".local")
+FREENAS_LDAP_LOCAL_USERCACHE = os.path.join(FREENAS_LDAP_LOCALDIR, ".users")
+FREENAS_LDAP_LOCAL_GROUPCACHE = os.path.join(FREENAS_LDAP_LOCALDIR, "groups")
+
+FREENAS_AD_CACHEDIR = os.path.join(FREENAS_LDAP_CACHEROOT, ".activedirectory")
+FREENAS_AD_USERCACHE = os.path.join(FREENAS_AD_CACHEDIR, ".users")
+FREENAS_AD_GROUPCACHE = os.path.join(FREENAS_AD_CACHEDIR, ".groups")
+FREENAS_AD_LOCALDIR = os.path.join(FREENAS_AD_CACHEDIR, ".local")
+FREENAS_AD_LOCAL_USERCACHE = os.path.join(FREENAS_AD_LOCALDIR, ".users")
+FREENAS_AD_LOCAL_GROUPCACHE = os.path.join(FREENAS_AD_LOCALDIR, ".groups")
+
+FLAGS_CACHE_READ_USER    = 0x00000001
+FLAGS_CACHE_WRITE_USER   = 0x00000002
+FLAGS_CACHE_READ_GROUP   = 0x00000004
+FLAGS_CACHE_WRITE_GROUP  = 0x00000008
+FLAGS_CACHE_READ_QUERY   = 0x00000010
+FLAGS_CACHE_WRITE_QUERY  = 0x00000020
+
 class FreeNAS_BaseCache(object):
     def __init__(self, cachedir=FREENAS_CACHEDIR):
         log.debug("FreeNAS_BaseCache._init__: enter")
@@ -140,3 +167,274 @@
 
     def close(self):
         self.__cache.close()
+
+
+class FreeNAS_LDAP_UserCache(FreeNAS_BaseCache):
+    def __init__(self, **kwargs):
+        log.debug("FreeNAS_LDAP_UserCache.__init__: enter")
+
+        cachedir = kwargs.get('cachedir', FREENAS_LDAP_USERCACHE)
+        dir = kwargs.get('dir', None)
+
+        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
+        super(FreeNAS_LDAP_UserCache, self).__init__(cachedir)
+
+        log.debug("FreeNAS_LDAP_UserCache.__init__: leave")
+
+
+class FreeNAS_LDAP_GroupCache(FreeNAS_BaseCache):
+    def __init__(self, **kwargs):
+        log.debug("FreeNAS_LDAP_GroupCache.__init__: enter")
+
+        cachedir = kwargs.get('cachedir', FREENAS_LDAP_GROUPCACHE)
+        dir = kwargs.get('dir', None)
+
+        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
+        super(FreeNAS_LDAP_GroupCache, self).__init__(cachedir)
+
+        log.debug("FreeNAS_LDAP_GroupCache.__init__: leave")
+
+
+class FreeNAS_LDAP_LocalUserCache(FreeNAS_BaseCache):
+    def __init__(self, **kwargs):
+        log.debug("FreeNAS_LDAP_LocalUserCache.__init__: enter")
+
+        cachedir = kwargs.get('cachedir', FREENAS_LDAP_LOCAL_USERCACHE)
+        dir = kwargs.get('dir', None)
+
+        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
+        super(FreeNAS_LDAP_LocalUserCache, self).__init__(cachedir)
+
+        log.debug("FreeNAS_LDAP_LocalUserCache.__init__: leave")
+
+
+class FreeNAS_LDAP_LocalGroupCache(FreeNAS_BaseCache):
+    def __init__(self, **kwargs):
+        log.debug("FreeNAS_LDAP_LocalGroupCache.__init__: enter")
+
+        cachedir = kwargs.get('cachedir', FREENAS_LDAP_LOCAL_GROUPCACHE)
+        dir = kwargs.get('dir', None)
+
+        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
+        super(FreeNAS_LDAP_LocalGroupCache, self).__init__(cachedir)
+
+        log.debug("FreeNAS_LDAP_LocalGroupCache.__init__: leave")
+
+
+class FreeNAS_ActiveDirectory_UserCache(FreeNAS_BaseCache):
+    def __init__(self, **kwargs):
+        log.debug("FreeNAS_ActiveDirectory_UserCache.__init__: enter")
+
+        cachedir = kwargs.get('cachedir', FREENAS_AD_USERCACHE)
+        dir = kwargs.get('dir', None)
+
+        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
+        super(FreeNAS_ActiveDirectory_UserCache, self).__init__(cachedir)
+
+        log.debug("FreeNAS_ActiveDirectory_UserCache.__init__: leave")
+
+
+class FreeNAS_ActiveDirectory_GroupCache(FreeNAS_BaseCache):
+    def __init__(self, **kwargs):
+        log.debug("FreeNAS_ActiveDirectory_GroupCache.__init__: enter")
+
+        cachedir = kwargs.get('cachedir', FREENAS_AD_GROUPCACHE)
+        dir = kwargs.get('dir', None)
+
+        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
+        super(FreeNAS_ActiveDirectory_GroupCache, self).__init__(cachedir)
+
+        log.debug("FreeNAS_ActiveDirectory_GroupCache.__init__: leave")
+
+
+class FreeNAS_ActiveDirectory_LocalUserCache(FreeNAS_BaseCache):
+    def __init__(self, **kwargs):
+        log.debug("FreeNAS_ActiveDirectory_LocalUserCache.__init__: enter")
+
+        cachedir = kwargs.get('cachedir', FREENAS_AD_LOCAL_USERCACHE)
+        dir = kwargs.get('dir', None)
+
+        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
+        super(FreeNAS_ActiveDirectory_LocalUserCache, self).__init__(cachedir)
+
+        log.debug("FreeNAS_ActiveDirectory_LocalUserCache.__init__: leave")
+
+
+class FreeNAS_ActiveDirectory_LocalGroupCache(FreeNAS_BaseCache):
+    def __init__(self, **kwargs):
+        log.debug("FreeNAS_ActiveDirectory_LocalGroupCache.__init__: enter")
+
+        cachedir = kwargs.get('cachedir', FREENAS_AD_LOCAL_GROUPCACHE)
+        dir = kwargs.get('dir', None)
+
+        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
+        super(FreeNAS_ActiveDirectory_LocalGroupCache, self).__init__(cachedir)
+
+        log.debug("FreeNAS_ActiveDirectory_LocalGroupCache.__init__: leave")
+
+
+class FreeNAS_LDAP_QueryCache(FreeNAS_BaseCache):
+    def __init__(self, **kwargs):
+        log.debug("FreeNAS_LDAP_QueryCache.__init__: enter")
+
+        cachedir = kwargs.get('cachedir', FREENAS_LDAP_QUERYCACHE)
+        dir = kwargs.get('dir', None)
+
+        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
+        super(FreeNAS_LDAP_QueryCache, self).__init__(cachedir)
+
+        log.debug("FreeNAS_LDAP_QueryCache.__init__: leave")
+
+
+class FreeNAS_NT4_UserCache(FreeNAS_BaseCache):
+    def __init__(self, **kwargs):
+        log.debug("FreeNAS_NT4_UserCache.__init__: enter")
+
+        cachedir = kwargs.get('cachedir', FREENAS_NT4_USERCACHE)
+        dir = kwargs.get('dir', None)
+
+        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
+        super(FreeNAS_NT4_UserCache, self).__init__(cachedir)
+
+        log.debug("FreeNAS_NT4_UserCache.__init__: leave")
+
+
+class FreeNAS_NT4_GroupCache(FreeNAS_BaseCache):
+    def __init__(self, **kwargs):
+        log.debug("FreeNAS_NT4_GroupCache.__init__: enter")
+
+        cachedir = kwargs.get('cachedir', FREENAS_NT4_GROUPCACHE)
+        dir = kwargs.get('dir', None)
+
+        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
+        super(FreeNAS_NT4_GroupCache, self).__init__(cachedir)
+
+        log.debug("FreeNAS_NT4_GroupCache.__init__: leave")
+
+
+class FreeNAS_NT4_LocalUserCache(FreeNAS_BaseCache):
+    def __init__(self, **kwargs):
+        log.debug("FreeNAS_NT4_LocalUserCache.__init__: enter")
+
+        cachedir = kwargs.get('cachedir', FREENAS_NT4_LOCAL_USERCACHE)
+        dir = kwargs.get('dir', None)
+
+        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
+        super(FreeNAS_NT4_LocalUserCache, self).__init__(cachedir)
+
+        log.debug("FreeNAS_NT4_LocalUserCache.__init__: leave")
+
+
+class FreeNAS_NT4_LocalGroupCache(FreeNAS_BaseCache):
+    def __init__(self, **kwargs):
+        log.debug("FreeNAS_NT4_LocalGroupCache.__init__: enter")
+
+        cachedir = kwargs.get('cachedir', FREENAS_NT4_LOCAL_GROUPCACHE)
+        dir = kwargs.get('dir', None)
+
+        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
+        super(FreeNAS_NT4_LocalGroupCache, self).__init__(cachedir)
+
+        log.debug("FreeNAS_NT4_LocalGroupCache.__init__: leave")
+
+
+class FreeNAS_Directory_UserCache(FreeNAS_BaseCache):
+    def __new__(cls, **kwargs):
+        log.debug("FreeNAS_Directory_UserCache.__new__: enter")
+
+        obj = None
+        if ldap_enabled():
+            obj = FreeNAS_LDAP_UserCache(**kwargs)
+
+        elif activedirectory_enabled():
+            obj = FreeNAS_ActiveDirectory_UserCache(**kwargs)
+
+        elif nt4_enabled():
+            obj = FreeNAS_NT4_UserCache(**kwargs)
+
+        log.debug("FreeNAS_Directory_UserCache.__new__: leave")
+        return obj
+
+
+class FreeNAS_Directory_GroupCache(FreeNAS_BaseCache):
+    def __new__(cls, **kwargs):
+        log.debug("FreeNAS_Directory_GroupCache.__new__: enter")
+
+        obj = None
+        if ldap_enabled():
+            obj = FreeNAS_LDAP_GroupCache(**kwargs)
+
+        elif activedirectory_enabled():
+            obj = FreeNAS_ActiveDirectory_GroupCache(**kwargs)
+
+        elif nt4_enabled():
+            obj = FreeNAS_NT4_GroupCache(**kwargs)
+
+        log.debug("FreeNAS_Directory_GroupCache.__new__: leave")
+        return obj
+
+
+class FreeNAS_Directory_LocalUserCache(FreeNAS_BaseCache):
+    def __new__(cls, **kwargs):
+        log.debug("FreeNAS_Directory_LocalUserCache.__new__: enter")
+
+        obj = None
+        if ldap_enabled():
+            obj = FreeNAS_LDAP_LocalUserCache(**kwargs)
+
+        elif activedirectory_enabled():
+            obj = FreeNAS_ActiveDirectory_LocalUserCache(**kwargs)
+
+        elif nt4_enabled():
+            obj = FreeNAS_NT4_LocalUserCache(**kwargs)
+
+        log.debug("FreeNAS_Directory_LocalUserCache.__new__: leave")
+        return obj
+
+
+class FreeNAS_Directory_LocalGroupCache(FreeNAS_BaseCache):
+    def __new__(cls, **kwargs):
+        log.debug("FreeNAS_Directory_LocalGroupCache.__new__: enter")
+
+        obj = None
+        if ldap_enabled():
+            obj = FreeNAS_LDAP_LocalGroupCache(**kwargs)
+
+        elif activedirectory_enabled():
+            obj = FreeNAS_ActiveDirectory_LocalGroupCache(**kwargs)
+
+        elif nt4_enabled():
+            obj = FreeNAS_NT4_LocalGroupCache(**kwargs)
+
+        log.debug("FreeNAS_Directory_LocalGroupCache.__new__: leave")
+        return obj
+
+
+class FreeNAS_UserCache(FreeNAS_BaseCache):
+    def __new__(cls, **kwargs):
+        log.debug("FreeNAS_UserCache.__new__: enter")
+
+        obj = None
+        if ldap_enabled() or activedirectory_enabled() or nt4_enabled():
+            obj = FreeNAS_Directory_LocalUserCache(**kwargs)
+
+        else:
+            obj = FreeNAS_BaseCache(**kwargs)
+
+        log.debug("FreeNAS_UserCache.__new__: leave")
+        return obj
+
+
+class FreeNAS_GroupCache(FreeNAS_BaseCache):
+    def __new__(cls, **kwargs):
+        log.debug("FreeNAS_GroupCache.__new__: enter")
+
+        obj = None
+        if ldap_enabled() or activedirectory_enabled() or nt4_enabled():
+            obj = FreeNAS_Directory_LocalGroupCache(**kwargs)
+
+        else:
+            obj = FreeNAS_BaseCache(**kwargs)
+
+        log.debug("FreeNAS_GroupCache.__new__: leave")
+        return obj

Modified: trunk/gui/common/freenasldap.py
===================================================================
--- trunk/gui/common/freenasldap.py	2013-01-25 03:51:04 UTC (rev 13145)
+++ trunk/gui/common/freenasldap.py	2013-01-25 05:35:39 UTC (rev 13146)
@@ -36,9 +36,10 @@
 from dns import resolver
 from ldap.controls import SimplePagedResultsControl
 
-from freenasUI.common.freenascache import FreeNAS_BaseCache, FREENAS_CACHEDIR
 from freenasUI.common.system import get_freenas_var, get_freenas_var_by_file, \
-    service_enabled, get_directoryservice
+    ldap_enabled, ldap_objects, activedirectory_enabled, activedirectory_objects, \
+    FREENAS_DATABASE
+from freenasUI.common.freenascache import *
 
 log = logging.getLogger('common.freenasldap')
 
@@ -49,28 +50,9 @@
 FREENAS_LDAP_PORT = get_freenas_var("FREENAS_LDAP_PORT", 389)
 FREENAS_LDAP_SSL_PORT = get_freenas_var("FREENAS_LDAP_SSL_PORT", 636)
 
-FREENAS_USERCACHE = os.path.join(FREENAS_CACHEDIR, ".users")
-FREENAS_GROUPCACHE = os.path.join(FREENAS_CACHEDIR, ".groups")
-
-FREENAS_LDAP_CACHEROOT = os.path.join(FREENAS_CACHEDIR, ".ldap")
-FREENAS_LDAP_QUERYCACHE = os.path.join(FREENAS_CACHEDIR, ".query")
-
-FREENAS_LDAP_CACHEDIR = os.path.join(FREENAS_LDAP_CACHEROOT, ".ldap")
-FREENAS_LDAP_USERCACHE = os.path.join(FREENAS_LDAP_CACHEDIR, ".users")
-FREENAS_LDAP_GROUPCACHE = os.path.join(FREENAS_LDAP_CACHEDIR, ".groups")
-FREENAS_LDAP_LOCALDIR = os.path.join(FREENAS_LDAP_CACHEDIR, ".local")
-FREENAS_LDAP_LOCAL_USERCACHE = os.path.join(FREENAS_LDAP_LOCALDIR, ".users")
-FREENAS_LDAP_LOCAL_GROUPCACHE = os.path.join(FREENAS_LDAP_LOCALDIR, "groups")
-
-FREENAS_AD_CACHEDIR = os.path.join(FREENAS_LDAP_CACHEROOT, ".activedirectory")
-FREENAS_AD_USERCACHE = os.path.join(FREENAS_AD_CACHEDIR, ".users")
-FREENAS_AD_GROUPCACHE = os.path.join(FREENAS_AD_CACHEDIR, ".groups")
-FREENAS_AD_LOCALDIR = os.path.join(FREENAS_AD_CACHEDIR, ".local")
-FREENAS_AD_LOCAL_USERCACHE = os.path.join(FREENAS_AD_LOCALDIR, ".users")
-FREENAS_AD_LOCAL_GROUPCACHE = os.path.join(FREENAS_AD_LOCALDIR, ".groups")
-
 FREENAS_AD_SEPARATOR = get_freenas_var("FREENAS_AD_SEPARATOR", '\\')
-FREENAS_AD_CONFIG_FILE = get_freenas_var("AD_CONFIG_FILE", "/etc/directoryservice/ActiveDirectory/config")
+FREENAS_AD_CONFIG_FILE = get_freenas_var("AD_CONFIG_FILE",
+    "/etc/directoryservice/ActiveDirectory/config")
 
 FREENAS_LDAP_CACHE_EXPIRE = get_freenas_var("FREENAS_LDAP_CACHE_EXPIRE", 60)
 FREENAS_LDAP_CACHE_ENABLE = get_freenas_var("FREENAS_LDAP_CACHE_ENABLE", 1)
@@ -81,295 +63,16 @@
 
 FREENAS_LDAP_PAGESIZE = get_freenas_var("FREENAS_LDAP_PAGESIZE", 8192)
 
-FREENAS_DATABASE = get_freenas_var("FREENAS_DATABASE", "/data/freenas-v1.db")
-
 ldap.protocol_version = FREENAS_LDAP_VERSION
 ldap.set_option(ldap.OPT_REFERRALS, FREENAS_LDAP_REFERRALS)
 
-FLAGS_CACHE_READ_USER    = 0x00000001
-FLAGS_CACHE_WRITE_USER   = 0x00000002
-FLAGS_CACHE_READ_GROUP   = 0x00000004
-FLAGS_CACHE_WRITE_GROUP  = 0x00000008
-FLAGS_CACHE_READ_QUERY   = 0x00000010
-FLAGS_CACHE_WRITE_QUERY  = 0x00000020
+FLAGS_DBINIT = 0x00010000
 
-FLAGS_DBINIT             = 0x00010000
 
-
-def LDAPEnabled():
-    enabled = False
-
-    if service_enabled('directoryservice') and \
-        get_directoryservice() == 'ldap':
-        enabled = True
-
-    return enabled
-
-
-def LDAP_objects():
-    h = sqlite3.connect(FREENAS_DATABASE)
-    h.row_factory = sqlite3.Row
-    c = h.cursor()
-
-    results = c.execute("SELECT * FROM services_ldap ORDER BY -id")
-
-    objects = []
-    for row in results:
-        obj = {}
-        for key in row.keys():
-            obj[key] = row[key]
-        objects.append(obj)
-
-    c.close()
-    h.close()
-    return objects
-
-
-def ActiveDirectoryEnabled():
-    enabled = False
-
-    if service_enabled('directoryservice') and \
-        get_directoryservice() == 'activedirectory':
-        enabled = True
-
-    return enabled
-
-
-def ActiveDirectory_objects():
-    h = sqlite3.connect(FREENAS_DATABASE)
-    h.row_factory = sqlite3.Row
-    c = h.cursor()
-
-    results = c.execute("SELECT * FROM services_activedirectory ORDER BY -id")
-
-    objects = []
-    for row in results:
-        obj = {}
-        for key in row.keys():
-            obj[key] = row[key]
-        objects.append(obj)
-
-    c.close()
-    h.close()
-    return objects
-
-
-class FreeNAS_LDAP_UserCache(FreeNAS_BaseCache):
-    def __init__(self, **kwargs):
-        log.debug("FreeNAS_LDAP_UserCache.__init__: enter")
-
-        cachedir = kwargs.get('cachedir', FREENAS_LDAP_USERCACHE)
-        dir = kwargs.get('dir', None)
-
-        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
-        super(FreeNAS_LDAP_UserCache, self).__init__(cachedir)
-
-        log.debug("FreeNAS_LDAP_UserCache.__init__: leave")
-
-
-class FreeNAS_LDAP_GroupCache(FreeNAS_BaseCache):
-    def __init__(self, **kwargs):
-        log.debug("FreeNAS_LDAP_GroupCache.__init__: enter")
-
-        cachedir = kwargs.get('cachedir', FREENAS_LDAP_GROUPCACHE)
-        dir = kwargs.get('dir', None)
-
-        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
-        super(FreeNAS_LDAP_GroupCache, self).__init__(cachedir)
-
-        log.debug("FreeNAS_LDAP_GroupCache.__init__: leave")
-
-
-class FreeNAS_LDAP_LocalUserCache(FreeNAS_BaseCache):
-    def __init__(self, **kwargs):
-        log.debug("FreeNAS_LDAP_LocalUserCache.__init__: enter")
-
-        cachedir = kwargs.get('cachedir', FREENAS_LDAP_LOCAL_USERCACHE)
-        dir = kwargs.get('dir', None)
-
-        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
-        super(FreeNAS_LDAP_LocalUserCache, self).__init__(cachedir)
-
-        log.debug("FreeNAS_LDAP_LocalUserCache.__init__: leave")
-
-
-class FreeNAS_LDAP_LocalGroupCache(FreeNAS_BaseCache):
-    def __init__(self, **kwargs):
-        log.debug("FreeNAS_LDAP_LocalGroupCache.__init__: enter")
-
-        cachedir = kwargs.get('cachedir', FREENAS_LDAP_LOCAL_GROUPCACHE)
-        dir = kwargs.get('dir', None)
-
-        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
-        super(FreeNAS_LDAP_LocalGroupCache, self).__init__(cachedir)
-
-        log.debug("FreeNAS_LDAP_LocalGroupCache.__init__: leave")
-
-
-class FreeNAS_ActiveDirectory_UserCache(FreeNAS_BaseCache):
-    def __init__(self, **kwargs):
-        log.debug("FreeNAS_ActiveDirectory_UserCache.__init__: enter")
-
-        cachedir = kwargs.get('cachedir', FREENAS_AD_USERCACHE)
-        dir = kwargs.get('dir', None)
-
-        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
-        super(FreeNAS_ActiveDirectory_UserCache, self).__init__(cachedir)
-
-        log.debug("FreeNAS_ActiveDirectory_UserCache.__init__: leave")
-
-
-class FreeNAS_ActiveDirectory_GroupCache(FreeNAS_BaseCache):
-    def __init__(self, **kwargs):
-        log.debug("FreeNAS_ActiveDirectory_GroupCache.__init__: enter")
-
-        cachedir = kwargs.get('cachedir', FREENAS_AD_GROUPCACHE)
-        dir = kwargs.get('dir', None)
-
-        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
-        super(FreeNAS_ActiveDirectory_GroupCache, self).__init__(cachedir)
-
-        log.debug("FreeNAS_ActiveDirectory_GroupCache.__init__: leave")
-
-
-class FreeNAS_ActiveDirectory_LocalUserCache(FreeNAS_BaseCache):
-    def __init__(self, **kwargs):
-        log.debug("FreeNAS_ActiveDirectory_LocalUserCache.__init__: enter")
-
-        cachedir = kwargs.get('cachedir', FREENAS_AD_LOCAL_USERCACHE)
-        dir = kwargs.get('dir', None)
-
-        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
-        super(FreeNAS_ActiveDirectory_LocalUserCache, self).__init__(cachedir)
-
-        log.debug("FreeNAS_ActiveDirectory_LocalUserCache.__init__: leave")
-
-
-class FreeNAS_ActiveDirectory_LocalGroupCache(FreeNAS_BaseCache):
-    def __init__(self, **kwargs):
-        log.debug("FreeNAS_ActiveDirectory_LocalGroupCache.__init__: enter")
-
-        cachedir = kwargs.get('cachedir', FREENAS_AD_LOCAL_GROUPCACHE)
-        dir = kwargs.get('dir', None)
-
-        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
-        super(FreeNAS_ActiveDirectory_LocalGroupCache, self).__init__(cachedir)
-
-        log.debug("FreeNAS_ActiveDirectory_LocalGroupCache.__init__: leave")
-
-
-class FreeNAS_LDAP_QueryCache(FreeNAS_BaseCache):
-    def __init__(self, **kwargs):
-        log.debug("FreeNAS_LDAP_QueryCache.__init__: enter")
-
-        cachedir = kwargs.get('cachedir', FREENAS_LDAP_QUERYCACHE)
-        dir = kwargs.get('dir', None)
-
-        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
-        super(FreeNAS_LDAP_QueryCache, self).__init__(cachedir)
-
-        log.debug("FreeNAS_LDAP_QueryCache.__init__: leave")
-
-
-class FreeNAS_Directory_UserCache(FreeNAS_BaseCache):
-    def __new__(cls, **kwargs):
-        log.debug("FreeNAS_Directory_UserCache.__new__: enter")
-
-        obj = None
-        if LDAPEnabled():
-            obj = FreeNAS_LDAP_UserCache(**kwargs)
-
-        elif ActiveDirectoryEnabled():
-            obj = FreeNAS_ActiveDirectory_UserCache(**kwargs)
-
-        log.debug("FreeNAS_Directory_UserCache.__new__: leave")
-        return obj
-
-
-class FreeNAS_Directory_GroupCache(FreeNAS_BaseCache):
-    def __new__(cls, **kwargs):
-        log.debug("FreeNAS_Directory_GroupCache.__new__: enter")
-
-        obj = None
-        if LDAPEnabled():
-            obj = FreeNAS_LDAP_GroupCache(**kwargs)
-
-        elif ActiveDirectoryEnabled():
-            obj = FreeNAS_ActiveDirectory_GroupCache(**kwargs)
-
-        log.debug("FreeNAS_Directory_GroupCache.__new__: leave")
-        return obj
-
-
-class FreeNAS_Directory_LocalUserCache(FreeNAS_BaseCache):
-    def __new__(cls, **kwargs):
-        log.debug("FreeNAS_Directory_LocalUserCache.__new__: enter")
-
-        obj = None
-        if LDAPEnabled():
-            obj = FreeNAS_LDAP_LocalUserCache(**kwargs)
-
-        elif ActiveDirectoryEnabled():
-            obj = FreeNAS_ActiveDirectory_LocalUserCache(**kwargs)
-
-        log.debug("FreeNAS_Directory_LocalUserCache.__new__: leave")
-        return obj
-
-
-class FreeNAS_Directory_LocalGroupCache(FreeNAS_BaseCache):
-    def __new__(cls, **kwargs):
-        log.debug("FreeNAS_Directory_LocalGroupCache.__new__: enter")
-
-        obj = None
-        if LDAPEnabled():
-            obj = FreeNAS_LDAP_LocalGroupCache(**kwargs)
-
-        elif ActiveDirectoryEnabled():
-            obj = FreeNAS_ActiveDirectory_LocalGroupCache(**kwargs)
-
-        log.debug("FreeNAS_Directory_LocalGroupCache.__new__: leave")
-        return obj
-
-
-class FreeNAS_UserCache(FreeNAS_BaseCache):
-    def __new__(cls, **kwargs):
-        log.debug("FreeNAS_UserCache.__new__: enter")
-
-        obj = None
-        if LDAPEnabled() or ActiveDirectoryEnabled():
-            obj = FreeNAS_Directory_LocalUserCache(**kwargs)
-
-        else:
-            obj = FreeNAS_BaseCache(**kwargs)
-
-        log.debug("FreeNAS_UserCache.__new__: leave")
-        return obj
-
-
-class FreeNAS_GroupCache(FreeNAS_BaseCache):
-    def __new__(cls, **kwargs):
-        log.debug("FreeNAS_GroupCache.__new__: enter")
-
-        obj = None
-        if LDAPEnabled() or ActiveDirectoryEnabled():
-            obj = FreeNAS_Directory_LocalGroupCache(**kwargs)
-
-        else:
-            obj = FreeNAS_BaseCache(**kwargs)
-
-        log.debug("FreeNAS_GroupCache.__new__: leave")
-        return obj
-
-
-# Fill these in!
 class FreeNAS_LDAP_Directory_Exception(Exception):
     pass
-
-
 class FreeNAS_ActiveDirectory_Exception(FreeNAS_LDAP_Directory_Exception):
     pass
-
-
 class FreeNAS_LDAP_Exception(FreeNAS_LDAP_Directory_Exception):
     pass
 
@@ -681,7 +384,7 @@
     def __db_init__(self, **kwargs):
         log.debug("FreeNAS_LDAP_Base.__db_init__: enter")
 
-        ldap = LDAP_objects()[0]
+        ldap = ldap_objects()[0]
 
         host = port = None
         tmphost = ldap['ldap_hostname']
@@ -1120,7 +823,7 @@
     def __db_init__(self, **kwargs):
         log.debug("FreeNAS_ActiveDirectory_Base.__db_init__: enter")
 
-        ad = ActiveDirectory_objects()[0]
+        ad = activedirectory_objects()[0]
 
         self.domain = self.adset(self.domain, ad['ad_domainname'])
         self.netbiosname = self.adset(self.netbiosname, ad['ad_workgroup'])

Added: trunk/gui/common/freenasnt4.py
===================================================================
--- trunk/gui/common/freenasnt4.py	                        (rev 0)
+++ trunk/gui/common/freenasnt4.py	2013-01-25 05:35:39 UTC (rev 13146)
@@ -0,0 +1,363 @@
+#+
+# Copyright 2010 iXsystems, Inc.
+# All rights reserved
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted providing that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+#####################################################################
+import grp
+import hashlib
+import ldap
+import logging
+import os
+import pwd
+import sqlite3
+import types
+
+from dns import resolver
+
+from freenasUI.common.freenascache import *
+from freenasUI.common.system import get_freenas_var, get_freenas_var_by_file, \
+    nt4_enabled, nt4_objects
+from freenasUI.common.cmd import cmd_pipe
+
+log = logging.getLogger('common.freenasnt4')
+
+WBINFO = "/usr/local/bin/wbinfo"
+
+class nt4_pipe(cmd_pipe):
+    pass
+
+
+class FreeNAS_NT4_Base(object):
+    def __init__(self, **kwargs):
+        log.debug("FreeNAS_NT4_Base.__init__: enter")
+
+        self.flags = 0
+        if kwargs.has_key('flags') and kwargs['flags']:
+            self.flags = kwargs['flags']
+
+        self.domain = None
+        if kwargs.has_key('domain') and kwargs['domain']:
+            self.domain = kwargs['domain']
+
+        self._settings = [] 
+        log.debug("FreeNAS_NT4_Base.__init__: leave")
+
+    def _save(self):
+        _s = {}
+        _s.update(self.__dict__)
+        self._settings.append(_s)
+
+    def _restore(self):
+        if self._settings:
+            _s = self._settings.pop() 
+            self.__dict__.update(_s)
+
+    def _wbinfo(self, args):
+        pobj = nt4_pipe("%s %s" % (WBINFO, args))
+        self._wberror = pobj.error
+
+        return (pobj.returncode, str(pobj))
+
+    def get_domains(self, domainname=None):
+        log.debug("FreeNAS_NT4_Base.get_domains: enter")
+
+        domains = []
+        (res, out) = self._wbinfo("--all-domains")
+        if res == 0:
+            for line in out.splitlines():
+                domain = line.strip()
+                if domainname:
+                    if domain.lower() == domainname.lower():
+                        domains.append(domain)
+                else: 
+                    domains.append(domain)
+
+        log.debug("FreeNAS_NT4_Base.get_domains: leave")
+        return domains
+
+    def get_domain(self):
+        log.debug("FreeNAS_NT4_Base.get_domain: enter")
+
+        domain = None
+        (res, out) = self._wbinfo("--own-domain")
+        if res == 0:
+            domain = out.strip()
+
+        log.debug("FreeNAS_NT4_Base.get_domain: leave")
+        return domain
+
+    def get_user(self, who, domain=None):
+        log.debug("FreeNAS_NT4_Base.get_user: enter")
+        log.debug("FreeNAS_NT4_Base.get_user: who = '%s'" % who)
+
+        wbargs = "--user-info '%s'" % who
+        if domain:
+            wbargs += " --domain=%s" % domain
+
+        user = None
+        (wbres, wbout) = self._wbinfo(wbargs)
+        if wbres == 0:
+            parts = wbout.strip().split(':')
+            if parts and len(parts) >= 7:
+                user = {
+                    "name": parts[0],
+                    "sAMAccountName": parts[0],
+                    "uid": parts[0],
+                    "uidNumber": parts[2],
+                    "gidNumber": parts[3],
+                    "gecos": parts[4],
+                    "homeDirectory": parts[5],
+                    "loginShell": parts[6]
+               }
+
+        log.debug("FreeNAS_NT4_Base.get_user: leave")
+        return user
+
+    def get_users(self, domain=None):
+        log.debug("FreeNAS_NT4_Base.get_users: enter")
+
+        wbargs = "-u"
+        if domain:
+            wbargs += " --domain=%s" % domain
+
+        users = [] 
+        (wbres, wbout) = self._wbinfo(wbargs)
+        if wbres == 0:
+            for line in wbout.splitlines():
+                (gres, gout) = self._wbinfo("--user-info '%s'" % line.strip())
+                parts = gout.strip().split(':')
+                if not parts or len(parts) < 7:
+                    continue
+
+                user = {
+                    "name": parts[0],
+                    "sAMAccountName": parts[0],
+                    "uid": parts[0],
+                    "uidNumber": parts[2],
+                    "gidNumber": parts[3],
+                    "gecos": parts[4],
+                    "homeDirectory": parts[5],
+                    "loginShell": parts[6]
+                }
+                users.append(user)
+
+        log.debug("FreeNAS_NT4_Base.get_users: leave")
+        return users
+
+    def get_group(self, who, domain=None):
+        log.debug("FreeNAS_NT4_Base.get_group: enter")
+        log.debug("FreeNAS_NT4_Base.get_group: who = '%s'" % who)
+
+        wbargs = "--group-info '%s'" % who
+        if domain:
+            wbargs += " --domain=%s" % domain 
+
+        group = None
+        (wbres, wbout) = self._wbinfo(wbargs)
+        if wbres == 0:
+            parts = wbout.strip().split(':')
+            if parts and len(parts) >= 4:
+                group = {
+                    "name": parts[0],
+                    "sAMAccountName": parts[0],
+                    "gidNumber": parts[2],
+                    "members": parts[3]
+                }
+
+        log.debug("FreeNAS_NT4_Base.get_group: leave")
+        return group
+
+    def get_groups(self, domain=None):
+        log.debug("FreeNAS_NT4_Base.get_groups: enter")
+
+        wbargs = "-g"
+        if domain:
+            wbargs += " --domain=%s" % domain
+
+        groups = []
+        (wbres, wbout) = self._wbinfo(wbargs)
+        if wbres == 0:
+            for line in wbout.splitlines():
+                (gres, gout) = self._wbinfo("--group-info '%s'" % line.strip())
+                parts = gout.strip().split(':')
+                if not parts or len(parts) < 4:
+                    continue
+                group = {
+                    "name": parts[0],
+                    "sAMAccountName": parts[0],
+                    "gidNumber": parts[2],
+                    "members": parts[3]
+                }
+                groups.append(group)
+
+        log.debug("FreeNAS_NT4_Base.get_groups: leave")
+        return groups
+
+
+class FreeNAS_NT4_Domain(FreeNAS_NT4_Base):
+    def __init__(self, **kwargs):
+        log.debug("FreeNAS_NT4_Domain.__init__: enter")
+
+        super(FreeNAS_NT4_Domain, self).__init__(**kwargs)
+
+        log.debug("FreeNAS_NT4_Domain.__init__: leave")
+
+
+class FreeNAS_NT4_Users(FreeNAS_NT4_Domain):
+    def __init__(self, **kwargs):
+        log.debug("FreeNAS_NT4_Users.__init__: enter")
+
+        super(FreeNAS_NT4_Users, self).__init__(**kwargs)
+
+        self.__users = {}
+        self.__ucache = {}
+        self.__ducache = {}
+
+        if kwargs.has_key('domain') and kwargs['domain']:
+            self.__domains = self.get_domains(domain=kwargs['domain'])
+        else:
+            self.__domains = self.get_domains()
+
+        if (self.flags & FLAGS_CACHE_READ_USER) or \
+            (self.flags & FLAGS_CACHE_WRITE_USER): 
+            for d in self.__domains:
+                self.__ucache[d] = FreeNAS_UserCache(dir=d)
+                self.__ducache[d] = FreeNAS_NT4_UserCache(dir=d)
+
+        self.__get_users()
+
+        log.debug("FreeNAS_NT4_Users.__init__: leave")
+
+    def __loaded(self, index, domain, write=False):
+        ret = False
+
+        paths = {}
+        ucachedir = self.__ucache[domain].cachedir
+        paths['u'] = os.path.join(ucachedir, ".ul")
+
+        ducachedir = self.__ducache[domain].cachedir
+        paths['du'] = os.path.join(ducachedir, ".dul")
+
+        file = None
+        try:
+            file = paths[index]
+
+        except: 
+            file = None
+
+        if file and write:
+            try:
+                with open(file, 'w+') as f:
+                    f.close()
+                ret = True
+
+            except:
+                ret = False
+
+        elif file:
+            if os.access(file, os.F_OK):
+                ret = True
+
+        return ret
+
+    def __get_users(self):
+        log.debug("FreeNAS_NT4_Users.__get_users: enter")
+
+        if self.flags & FLAGS_CACHE_READ_USER:
+            dcount = len(self.__domains) 
+            count = 0
+
+            for d in self.__domains:
+                if self.__loaded('u', d):
+                    self.__users[d] = self.__ucache[d] 
+                    count += 1
+
+            if count == dcount:
+                log.debug("FreeNAS_NT4_Users.__get_users: users in cache")
+                log.debug("FreeNAS_NT4_Users.__get_users: leave")
+                return 
+
+        self._save()
+        for d in self.__domains:
+            self.__users[d] = []
+
+            if (self.flags & FLAGS_CACHE_READ_USER) and self.__loaded('du', d):
+                log.debug("FreeNAS_NT4_Users.__get_users: "
+                    "NT4 [%s] users in cache" % d)
+                nt4_users = self.__ducache[d]
+
+            else:
+                log.debug("FreeNAS_NT4_Users.__get_users: "
+                    "NT4 [%s] users not in cache" % d)
+                nt4_users = self.get_users(domain=d)
+
+            for u in nt4_users:
+                uid = u['uid']
+
+                if self.flags & FLAGS_CACHE_WRITE_USER:
+                    self.__ducache[d][uid] = u
+
+                sAMAccountName = u['sAMAccountName']
+                try:
+                    pw = pwd.getpwnam(sAMAccountName)
+
+                except Exception, e:
+                    log.debug("Error on getpwname: %s",  e)
+                    continue
+
+                self.__users[d].append(pw) 
+                if self.flags & FLAGS_CACHE_WRITE_USER:
+                    self.__ucache[d][sAMAccountName] = pw
+
+                pw = None
+
+            if self.flags & FLAGS_CACHE_WRITE_USER:
+                self.__loaded('u', d, True)
+                self.__loaded('du', d, True)
+
+        self._restore()
+        log.debug("FreeNAS_NT4_Users.__get_users: leave")
+
+    def __len__(self):
+        length = 0
+        for d in self.__domains:
+            length += len(self.__users[d])
+        return length
+
+    def __iter__(self):
+        for d in self.__domains:
+            for user in self.__users[d]:
+                yield user
+
+
+class FreeNAS_NT4_Groups(FreeNAS_NT4_Domain):
+    pass
+
+
+class FreeNAS_NT4_User(FreeNAS_NT4_Domain):
+    pass
+
+
+class FreeNAS_NT4_Group(FreeNAS_NT4_Domain):
+    pass

Modified: trunk/gui/common/freenasusers.py
===================================================================
--- trunk/gui/common/freenasusers.py	2013-01-25 03:51:04 UTC (rev 13145)
+++ trunk/gui/common/freenasusers.py	2013-01-25 05:35:39 UTC (rev 13146)
@@ -30,10 +30,10 @@
 import sqlite3
 import types
 
-from freenasUI.common.freenasldap import (FREENAS_DATABASE,
-    LDAPEnabled, ActiveDirectoryEnabled,
-    FreeNAS_Directory_Group, FreeNAS_Directory_User,
-    FreeNAS_Directory_Groups, FreeNAS_Directory_Users)
+from freenasUI.common.system import (ldap_enabled,
+    activedirectory_enabled, nt4_enabled, FREENAS_DATABASE)
+from freenasUI.common.freenasldap import (FreeNAS_Directory_Group,
+    FreeNAS_Directory_User, FreeNAS_Directory_Groups, FreeNAS_Directory_Users)
 
 log = logging.getLogger("common.freenasusers")
 
@@ -200,12 +200,12 @@
 
         TODO: Warn the user in the GUI that "something" happenned
         """
-        ldap_enabled = LDAPEnabled()
-        ad_enabled = ActiveDirectoryEnabled()
+        _ldap_enabled = ldap_enabled()
+        _ad_enabled = activedirectory_enabled()
         try:
             self.__groups = FreeNAS_Directory_Groups(
-                ldap_enabled=ldap_enabled,
-                ad_enabled=ad_enabled,
+                ldap_enabled=_ldap_enabled,
+                ad_enabled=_ad_enabled,
                 **kwargs)
         except Exception, e:
             log.error("FreeNAS Directory Groups could not be retrieved: %s",
@@ -220,7 +220,7 @@
         for obj in objects:
             self.__bsd_groups.append(
                 FreeNAS_Group(obj['bsdgrp_group'],
-                    ldap_enabled=ldap_enabled, ad_enabled=ad_enabled)
+                    ldap_enabled=_ldap_enabled, ad_enabled=_ad_enabled)
                 )
 
         log.debug("FreeNAS_Groups.__init__: leave")
@@ -317,12 +317,12 @@
 
         TODO: Warn the user in the GUI that "something" happenned
         """
-        ldap_enabled = LDAPEnabled()
-        ad_enabled = ActiveDirectoryEnabled()
+        _ldap_enabled = ldap_enabled()
+        _ad_enabled = activedirectory_enabled()
         try:
             self.__users = FreeNAS_Directory_Users(
-                ldap_enabled=ldap_enabled,
-                ad_enabled=ad_enabled,
+                ldap_enabled=_ldap_enabled,
+                ad_enabled=_ad_enabled,
                 **kwargs)
         except Exception, e:
             log.error("FreeNAS Directory Users could not be retrieved: %s",
@@ -337,7 +337,7 @@
         for obj in objects:
             self.__bsd_users.append(
                 FreeNAS_User(obj['bsdusr_username'],
-                    ldap_enabled=ldap_enabled, ad_enabled=ad_enabled)
+                    ldap_enabled=_ldap_enabled, ad_enabled=_ad_enabled)
                 )
 
         log.debug("FreeNAS_Users.__init__: leave")

Modified: trunk/gui/common/system.py
===================================================================
--- trunk/gui/common/system.py	2013-01-25 03:51:04 UTC (rev 13145)
+++ trunk/gui/common/system.py	2013-01-25 05:35:39 UTC (rev 13146)
@@ -88,6 +88,7 @@
         val = default
     return val
 
+FREENAS_DATABASE = get_freenas_var("FREENAS_DATABASE", "/data/freenas-v1.db")
 
 def send_mail(subject=None,
               text=None,
@@ -303,3 +304,90 @@
     h.close()
 
     return directoryservice
+
+
+def ldap_enabled():
+    enabled = False
+
+    if service_enabled('directoryservice') and \
+        get_directoryservice() == 'ldap':
+        enabled = True
+
+    return enabled
+
+
+def ldap_objects():
+    h = sqlite3.connect(FREENAS_DATABASE)
+    h.row_factory = sqlite3.Row
+    c = h.cursor()
+
+    results = c.execute("SELECT * FROM services_ldap ORDER BY -id")
+
+    objects = []
+    for row in results:
+        obj = {}
+        for key in row.keys():
+            obj[key] = row[key]
+        objects.append(obj)
+
+    c.close()
+    h.close()
+    return objects
+
+
+def activedirectory_enabled():
+    enabled = False
+
+    if service_enabled('directoryservice') and \
+        get_directoryservice() == 'activedirectory':
+        enabled = True
+
+    return enabled
+
+
+def activedirectory_objects():
+    h = sqlite3.connect(FREENAS_DATABASE)
+    h.row_factory = sqlite3.Row
+    c = h.cursor()
+
+    results = c.execute("SELECT * FROM services_activedirectory ORDER BY -id")
+
+    objects = []
+    for row in results:
+        obj = {}
+        for key in row.keys():
+            obj[key] = row[key]
+        objects.append(obj)
+
+    c.close()
+    h.close()
+    return objects
+
+
+def nt4_enabled():
+    enabled = False
+
+    if service_enabled('directoryservice') and \
+        get_directoryservice() == 'nt4':
+        enabled = True
+
+    return enabled
+
+
+def nt4_objects():
+    h = sqlite3.connect(FREENAS_DATABASE)
+    h.row_factory = sqlite3.Row
+    c = h.cursor()
+
+    results = c.execute("SELECT * FROM services_nt4 ORDER BY -id")
+
+    objects = []
+    for row in results:
+        obj = {}
+        for key in row.keys():
+            obj[key] = row[key]
+        objects.append(obj)
+
+    c.close()
+    h.close()
+    return objects

Modified: trunk/gui/freeadmin/forms.py
===================================================================
--- trunk/gui/freeadmin/forms.py	2013-01-25 03:51:04 UTC (rev 13145)
+++ trunk/gui/freeadmin/forms.py	2013-01-25 05:35:39 UTC (rev 13146)
@@ -36,7 +36,8 @@
 from dojango import forms
 from dojango.forms import widgets
 from dojango.forms.widgets import DojoWidgetMixin
-from freenasUI.common.freenasldap import (FLAGS_DBINIT, FLAGS_CACHE_READ_USER,
+from freenasUI.common.freenasldap import FLAGS_DBINIT
+from freenasUI.common.freenascache import (FLAGS_CACHE_READ_USER,
     FLAGS_CACHE_WRITE_USER, FLAGS_CACHE_READ_GROUP, FLAGS_CACHE_WRITE_GROUP)
 from freenasUI.common.freenasusers import (FreeNAS_Users, FreeNAS_User,
     FreeNAS_Groups, FreeNAS_Group)

Modified: trunk/gui/middleware/notifier.py
===================================================================
--- trunk/gui/middleware/notifier.py	2013-01-25 03:51:04 UTC (rev 13145)
+++ trunk/gui/middleware/notifier.py	2013-01-25 05:35:39 UTC (rev 13146)
@@ -527,10 +527,11 @@
         return True
 
     def _started_ldap(self):
-        from freenasUI.common.freenasldap import FreeNAS_LDAP, LDAPEnabled, FLAGS_DBINIT
+        from freenasUI.common.freenasldap import FreeNAS_LDAP, FLAGS_DBINIT
+        from freenasUI.common.system import ldap_enabled
 
         ret = False
-        if LDAPEnabled():
+        if ldap_enabled():
             f = FreeNAS_LDAP(flags=FLAGS_DBINIT)
             f.open()
             if f.isOpen():
@@ -616,8 +617,8 @@
         self.__system("/etc/directoryservice/NT4/ctl stop")
 
     def _started_activedirectory(self):
-        from freenasUI.common.freenasldap import (FreeNAS_ActiveDirectory,
-            ActiveDirectoryEnabled, FLAGS_DBINIT)
+        from freenasUI.common.freenasldap import (FreeNAS_ActiveDirectory, FLAGS_DBINIT)
+        from freenasUI.common.system import activedirectory_enabled
 
         for srv in ('kinit', 'activedirectory', ):
             if (self.__system_nolog('/usr/sbin/service ix-%s status' % (srv, ))
@@ -625,7 +626,7 @@
                 return False
 
         ret = False
-        if ActiveDirectoryEnabled():
+        if activedirectory_enabled():
             f = FreeNAS_ActiveDirectory(flags=FLAGS_DBINIT)
             f.open()
             if f.isOpen():

Modified: trunk/gui/tools/cachetool.py
===================================================================
--- trunk/gui/tools/cachetool.py	2013-01-25 03:51:04 UTC (rev 13145)
+++ trunk/gui/tools/cachetool.py	2013-01-25 05:35:39 UTC (rev 13146)
@@ -135,10 +135,10 @@
         print "dg key: %s" % key
 
 def cache_keys(**kwargs):
-    if ActiveDirectoryEnabled():
+    if activedirectory_enabled():
         _cache_keys_ActiveDirectory(**kwargs)
 
-    elif LDAPEnabled():
+    elif ldap_enabled():
         _cache_keys_default(**kwargs)
 
     else:
@@ -187,10 +187,10 @@
         print "dg: %s=%s" % (key, dgcache[key])
 
 def cache_rawdump(**kwargs):
-    if ActiveDirectoryEnabled():
+    if activedirectory_enabled():
         _cache_rawdump_ActiveDirectory(**kwargs)
 
-    elif LDAPEnabled():
+    elif ldap_enabled():
         _cache_rawdump_default(**kwargs)
 
     else:
@@ -306,10 +306,10 @@
                 print "%s: %s" % (val, dgcache[val])
 
 def cache_check(**kwargs):
-    if ActiveDirectoryEnabled():
+    if activedirectory_enabled():
         _cache_check_ActiveDirectory(**kwargs) 
 
-    elif LDAPEnabled():
+    elif ldap_enabled():
         _cache_check_default(**kwargs)
      
     else:
@@ -338,10 +338,10 @@
     print "\n"
 
 def cache_count(**kwargs):
-    if ActiveDirectoryEnabled():
+    if activedirectory_enabled():
         _cache_count_ActiveDirectory(**kwargs)
 
-    elif LDAPEnabled():
+    elif ldap_enabled():
         _cache_count_default(**kwargs)
 
     else:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13157
          http://freenas.svn.sourceforge.net/freenas/?rev=13157&view=rev
Author:   zippybr
Date:     2013-01-25 21:22:14 +0000 (Fri, 25 Jan 2013)
Log Message:
-----------
Do not unlabel disk for device extent, thats dumb! :)


Conflicts:
	gui/services/forms.py

Modified Paths:
--------------
    trunk/gui/middleware/notifier.py
    trunk/gui/services/forms.py

Modified: trunk/gui/middleware/notifier.py
===================================================================
--- trunk/gui/middleware/notifier.py	2013-01-25 21:18:06 UTC (rev 13156)
+++ trunk/gui/middleware/notifier.py	2013-01-25 21:22:14 UTC (rev 13157)
@@ -3142,10 +3142,11 @@
         elif fstype is None:
             p1 = Popen(["/sbin/geom", "label", "label", label, dev], stdin=PIPE, stdout=PIPE)
         else:
-            return False
-        if p1.wait() == 0:
-            return True
-        return False
+            return False, 'Unknown fstype %r' % fstype
+        err = p1.communicate()[1]
+        if p1.returncode == 0:
+            return True, ''
+        return False, err
 
     def detect_volumes(self, extra=None):
         """

Modified: trunk/gui/services/forms.py
===================================================================
--- trunk/gui/services/forms.py	2013-01-25 21:18:06 UTC (rev 13156)
+++ trunk/gui/services/forms.py	2013-01-25 21:22:14 UTC (rev 13157)
@@ -1011,7 +1011,6 @@
     def save(self, commit=True):
         oExtent = super(iSCSITargetExtentForm, self).save(commit=False)
         if commit and self.cleaned_data["iscsi_extent_type"] == 'disk':
-            # label it only if it is a real disk
             if self.cleaned_data["iscsi_extent_disk"].startswith("zvol"):
                 oExtent.iscsi_target_extent_path = self.cleaned_data["iscsi_extent_disk"]
                 oExtent.iscsi_target_extent_type = 'ZVOL'
@@ -1023,11 +1022,24 @@
                 oExtent.iscsi_target_extent_type = 'Disk'
                 oExtent.iscsi_target_extent_path = str(diskobj.id)
             else:
-                notifier().unlabel_disk(str(self.cleaned_data["iscsi_extent_disk"]))
                 diskobj = models.Disk.objects.get(disk_name=self.cleaned_data["iscsi_extent_disk"])
-                if diskobj.disk_identifier.startswith("{devicename}") or \
-                        diskobj.disk_identifier.startswith("{uuid}"):
-                    notifier().label_disk("extent_%s" % self.cleaned_data["iscsi_extent_disk"], self.cleaned_data["iscsi_extent_disk"])
+                # label it only if it is a real disk
+                if (
+                    diskobj.disk_identifier.startswith("{devicename}")
+                    or
+                    diskobj.disk_identifier.startswith("{uuid}")
+                ):
+                    success, msg = notifier().label_disk(
+                        "extent_%s" % self.cleaned_data["iscsi_extent_disk"],
+                        self.cleaned_data["iscsi_extent_disk"]
+                    )
+                    if success is False:
+                        raise MiddlewareError(
+                            _("Serial not found and glabel failed for %s: %s" % (
+                                self.cleaned_data["iscsi_extent_disk"],
+                                msg,
+                            )
+                        )
                     notifier().sync_disk(self.cleaned_data["iscsi_extent_disk"])
                 oExtent.iscsi_target_extent_type = 'Disk'
                 oExtent.iscsi_target_extent_path = str(diskobj.id)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13178
          http://freenas.svn.sourceforge.net/freenas/?rev=13178&view=rev
Author:   zippybr
Date:     2013-01-29 14:38:33 +0000 (Tue, 29 Jan 2013)
Log Message:
-----------
Change button to reflect volume add or extend operation in Volume Manager

Modified Paths:
--------------
    trunk/gui/freeadmin/static/lib/js/freeadmin.js
    trunk/gui/templates/storage/wizard.html

Modified: trunk/gui/freeadmin/static/lib/js/freeadmin.js
===================================================================
--- trunk/gui/freeadmin/static/lib/js/freeadmin.js	2013-01-29 11:59:48 UTC (rev 13177)
+++ trunk/gui/freeadmin/static/lib/js/freeadmin.js	2013-01-29 14:38:33 UTC (rev 13178)
@@ -787,6 +787,11 @@
         var add_mode = false;
         if(add && add.get("value") != '') {
             add_mode = true;
+            domStyle.set("addVolLabel", "display", "none");
+            domStyle.set("extendVolLabel", "display", "");
+        } else {
+            domStyle.set("addVolLabel", "display", "");
+            domStyle.set("extendVolLabel", "display", "none");
         }
         var disks = registry.byId("wizarddisks");
         var d = disks.get('value');

Modified: trunk/gui/templates/storage/wizard.html
===================================================================
--- trunk/gui/templates/storage/wizard.html	2013-01-29 11:59:48 UTC (rev 13177)
+++ trunk/gui/templates/storage/wizard.html	2013-01-29 14:38:33 UTC (rev 13178)
@@ -194,8 +194,13 @@
     <script type="dojo/method">
         wizardcheckings(true, true);
     </script>
+    <div id="addVolLabel">
     {% trans "Add Volume" %}<br />
     <b style="color: red">{% trans "Existing data will be cleared" %}</b>
+    </div>
+    <div id="extendVolLabel" style="display: none;">
+    {% trans "Exnted Volume" %}
+    </div>
         </button>
         <button data-dojo-type="dijit.form.Button" type="button" class="cancelform">
             {% trans "Cancel" %}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13205
          http://freenas.svn.sourceforge.net/freenas/?rev=13205&view=rev
Author:   jhixson
Date:     2013-02-01 01:32:25 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
Allow pipes to be created that don't block SIGCHLD

Modified Paths:
--------------
    trunk/gui/common/pipesubr.py
    trunk/gui/system/views.py

Modified: trunk/gui/common/pipesubr.py
===================================================================
--- trunk/gui/common/pipesubr.py	2013-02-01 01:24:58 UTC (rev 13204)
+++ trunk/gui/common/pipesubr.py	2013-02-01 01:32:25 UTC (rev 13205)
@@ -29,21 +29,43 @@
 from subprocess import Popen, PIPE
 from os import system as __system
 import logging
+import ctypes
+import signal
 
+
 logging.NOTICE = 60
 logging.addLevelName(logging.NOTICE, "NOTICE")
 logging.ALERT = 70
 logging.addLevelName(logging.ALERT, "ALERT")
 log = logging.getLogger('common.pipesubr')
 
+SIG_BLOCK = 1
+SIG_UNBLOCK = 2
+SIG_SETMASK = 3
 
-def pipeopen(command, important=True, logger=log):
+def unblock_sigchld():
+    libc = ctypes.cdll.LoadLibrary("libc.so.7")
+    mask = (ctypes.c_uint32 * 4)(0, 0, 0, 0)
+    pmask = ctypes.pointer(mask)
+    libc.sigprocmask(SIG_BLOCK, 0, pmask)
+    libc.sigdelset(pmask, signal.SIGCHLD)
+    libc.sigprocmask(SIG_SETMASK, pmask, None)
+
+
+def pipeopen(command, important=True, logger=log, allowfork=False):
     logger.log(logging.NOTICE if important else logging.DEBUG,
         "Popen()ing: " + command)
     args = shlex_split(str(command))
-    return Popen(args, stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)
 
+    preexec_fn = None
+    if allowfork:
+        preexec_fn = unblock_sigchld
 
+    return Popen(args, stdin=PIPE, stdout=PIPE, stderr=PIPE,
+        close_fds=True, preexec_fn=preexec_fn)
+
+
+
 def system(command, important=True, logger=log):
     logger.log(logging.NOTICE if important else logging.DEBUG,
         "Executing: " + command)

Modified: trunk/gui/system/views.py
===================================================================
--- trunk/gui/system/views.py	2013-02-01 01:24:58 UTC (rev 13204)
+++ trunk/gui/system/views.py	2013-02-01 01:32:25 UTC (rev 13205)
@@ -29,6 +29,7 @@
 import os
 import shutil
 import socket
+import string
 import subprocess
 import time
 import urllib
@@ -48,6 +49,7 @@
 
 from freenasUI.account.models import bsdUsers
 from freenasUI.common.system import get_sw_name, get_sw_version, send_mail
+from freenasUI.common.pipesubr import pipeopen
 from freenasUI.freeadmin.views import JsonResp
 from freenasUI.middleware.notifier import notifier
 from freenasUI.network.models import GlobalConfiguration
@@ -503,9 +505,9 @@
     if request.method == "POST":
         form = forms.DebugForm(request.POST)
         if form.is_valid():
-            opts = form.get_options()
-            p1 = subprocess.Popen(["/usr/local/bin/freenas-debug"] + opts,
-                stdout=subprocess.PIPE)
+            opts = ["/usr/local/bin/freenas-debug"]
+            opts += form.get_options()
+            p1 = pipeopen(string.join(opts, ' '), allowfork=True)
             debug = p1.communicate()[0]
             with open(DEBUG_TEMP, 'w') as f:
                 f.write(debug)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13213
          http://freenas.svn.sourceforge.net/freenas/?rev=13213&view=rev
Author:   zippybr
Date:     2013-02-01 10:42:50 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
Add a very simple helper to log the whole traceback stack

Modified Paths:
--------------
    trunk/gui/freeadmin/navtree.py

Added Paths:
-----------
    trunk/gui/common/log.py

Added: trunk/gui/common/log.py
===================================================================
--- trunk/gui/common/log.py	                        (rev 0)
+++ trunk/gui/common/log.py	2013-02-01 10:42:50 UTC (rev 13213)
@@ -0,0 +1,12 @@
+import logging
+import traceback
+
+log = logging.getLogger('common.log')
+
+
+def log_traceback(log=log, level=logging.DEBUG):
+    """
+    Log the whole exception in the stack, line by line
+    """
+    for line in traceback.format_exc().splitlines():
+        log.log(level, line)

Modified: trunk/gui/freeadmin/navtree.py
===================================================================
--- trunk/gui/freeadmin/navtree.py	2013-02-01 10:28:19 UTC (rev 13212)
+++ trunk/gui/freeadmin/navtree.py	2013-02-01 10:42:50 UTC (rev 13213)
@@ -38,6 +38,7 @@
 
 from eventlet.green import urllib2
 
+from freenasUI.common.log import log_traceback
 from freenasUI.freeadmin.tree import (
     tree_roots, TreeRoot, TreeNode, unserialize_tree
 )
@@ -211,6 +212,7 @@
                     "Failed to generate navtree for app %s: %s",
                     app,
                     e)
+                log_traceback()
 
         nav = TreeRoot(
             'display',

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13266
          http://freenas.svn.sourceforge.net/freenas/?rev=13266&view=rev
Author:   zippybr
Date:     2013-02-04 17:21:04 +0000 (Mon, 04 Feb 2013)
Log Message:
-----------
Get rid of the redundance for embedded FreeAdmin and registered ones

Modified Paths:
--------------
    trunk/gui/account/models.py
    trunk/gui/jails/models.py
    trunk/gui/network/admin.py
    trunk/gui/network/models.py
    trunk/gui/plugins/models.py

Modified: trunk/gui/account/models.py
===================================================================
--- trunk/gui/account/models.py	2013-02-04 17:05:49 UTC (rev 13265)
+++ trunk/gui/account/models.py	2013-02-04 17:21:04 UTC (rev 13266)
@@ -130,18 +130,6 @@
         verbose_name = _("User")
         verbose_name_plural = _("Users")
 
-    class FreeAdmin:
-        create_modelform = "bsdUserCreationForm"
-        edit_modelform = "bsdUserChangeForm"
-
-        object_filters = {'bsdusr_builtin__exact': False}
-        object_num = -1
-
-        icon_object = u"UserIcon"
-        icon_model = u"UsersIcon"
-        icon_add = u"AddUserIcon"
-        icon_view = u"ViewAllUsersIcon"
-
     def __unicode__(self):
         return self.bsdusr_username
 

Modified: trunk/gui/jails/models.py
===================================================================
--- trunk/gui/jails/models.py	2013-02-04 17:05:49 UTC (rev 13265)
+++ trunk/gui/jails/models.py	2013-02-04 17:21:04 UTC (rev 13266)
@@ -154,10 +154,7 @@
         verbose_name = _("Jails")
         verbose_name_plural = _("Jails")
 
-    class FreeAdmin:
-        pass
 
-
 class JailsConfiguration(Model):
 
     jc_path = models.CharField(

Modified: trunk/gui/network/admin.py
===================================================================
--- trunk/gui/network/admin.py	2013-02-04 17:05:49 UTC (rev 13265)
+++ trunk/gui/network/admin.py	2013-02-04 17:21:04 UTC (rev 13266)
@@ -95,6 +95,8 @@
 
 class LAGGInterfaceMembersFAdmin(BaseFreeAdmin):
 
+    icon_object = u"LAGGIcon"
+    icon_model = u"LAGGIcon"
     resource = LAGGInterfaceMembersResource
 
     def get_datagrid_filters(self, request):

Modified: trunk/gui/network/models.py
===================================================================
--- trunk/gui/network/models.py	2013-02-04 17:05:49 UTC (rev 13265)
+++ trunk/gui/network/models.py	2013-02-04 17:21:04 UTC (rev 13266)
@@ -366,13 +366,7 @@
         self.lagg_interface.delete()
         notifier().iface_destroy(self.lagg_interface.int_interface)
 
-    class FreeAdmin:
-        icon_object = u"VLANIcon"
-        icon_model = u"VLANIcon"
-        icon_add = u"AddVLANIcon"
-        icon_view = u"ViewAllVLANsIcon"
 
-
 class LAGGInterfaceMembers(Model):
     # Physical interfaces list inside one LAGG group
     lagg_interfacegroup = models.ForeignKey(
@@ -407,11 +401,7 @@
         verbose_name_plural = _("Link Aggregations")
         ordering = ["lagg_interfacegroup"]
 
-    class FreeAdmin:
-        icon_object = u"LAGGIcon"
-        icon_model = u"LAGGIcon"
 
-
 class StaticRoute(Model):
     sr_destination = models.CharField(
             max_length=120,

Modified: trunk/gui/plugins/models.py
===================================================================
--- trunk/gui/plugins/models.py	2013-02-04 17:05:49 UTC (rev 13265)
+++ trunk/gui/plugins/models.py	2013-02-04 17:21:04 UTC (rev 13266)
@@ -121,13 +121,6 @@
         verbose_name = _(u"Mount Point")
         verbose_name_plural = _(u"Mount Points")
 
-    class FreeAdmin:
-        menu_child_of = u"services.PluginsJail.management"
-        icon_model = u"MountPointIcon"
-        icon_object = u"MountPointIcon"
-        icon_add = u"AddMountPointIcon"
-        icon_view = u"ViewMountPointIcon"
-
     def __unicode__(self):
         return self.source
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13302
          http://freenas.svn.sourceforge.net/freenas/?rev=13302&view=rev
Author:   zippybr
Date:     2013-02-15 13:29:57 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
Feature: edit disks in bulk

ticket: #681

Modified Paths:
--------------
    trunk/gui/freeadmin/api/resources.py
    trunk/gui/storage/admin.py
    trunk/gui/storage/forms.py
    trunk/gui/storage/urls.py
    trunk/gui/storage/views.py

Added Paths:
-----------
    trunk/gui/templates/storage/disk_editbulk.html

Modified: trunk/gui/freeadmin/api/resources.py
===================================================================
--- trunk/gui/freeadmin/api/resources.py	2013-02-15 10:00:30 UTC (rev 13301)
+++ trunk/gui/freeadmin/api/resources.py	2013-02-15 13:29:57 UTC (rev 13302)
@@ -24,7 +24,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 #####################################################################
-import json
 import logging
 
 from django.core.urlresolvers import reverse
@@ -89,6 +88,7 @@
         bundle.data['_wipe_url'] = reverse('storage_disk_wipe', kwargs={
             'devname': bundle.obj.disk_name,
         })
+        bundle.data['_editbulk_url'] = reverse('storage_disk_editbulk')
         return bundle
 
 

Modified: trunk/gui/storage/admin.py
===================================================================
--- trunk/gui/storage/admin.py	2013-02-15 10:00:30 UTC (rev 13301)
+++ trunk/gui/storage/admin.py	2013-02-15 13:29:57 UTC (rev 13302)
@@ -37,6 +37,30 @@
             }""",
         }
 
+        actions['EditBulk'] = {
+            'button_name': _('Edit In Bulk'),
+            'on_click': """function() {
+                var mybtn = this;
+                var ids = [];
+                for (var i in grid.selection) {
+                    var data = grid.row(i).data;
+                    ids.push(data.id);
+                }
+                editObject('Edit In Bulk', data._editbulk_url + '?ids=' + ids.join(","), [mybtn,]);
+            }""",
+            'on_select_after': """function(evt, actionName, action) {
+                if(evt.rows.length <= 1) {
+                    query(".grid" + actionName).forEach(function(item, idx) {
+                        domStyle.set(item, "display", "none");
+                    });
+                } else {
+                    query(".grid" + actionName).forEach(function(item, idx) {
+                        domStyle.set(item, "display", "block");
+                    });
+                }
+            }"""
+        }
+
         return actions
 
 

Modified: trunk/gui/storage/forms.py
===================================================================
--- trunk/gui/storage/forms.py	2013-02-15 10:00:30 UTC (rev 13301)
+++ trunk/gui/storage/forms.py	2013-02-15 13:29:57 UTC (rev 13302)
@@ -927,6 +927,89 @@
         return obj
 
 
+class DiskEditBulkForm(Form):
+
+    ids = forms.CharField(
+        widget=forms.widgets.HiddenInput(),
+    )
+    disk_hddstandby = forms.ChoiceField(
+        choices=(('', '-----'),) + choices.HDDSTANDBY_CHOICES,
+        required=False,
+        initial="Always On",
+        label=_("HDD Standby")
+    )
+    disk_advpowermgmt = forms.ChoiceField(
+        required=False,
+        choices=(('', '-----'),) + choices.ADVPOWERMGMT_CHOICES,
+        label=_("Advanced Power Management")
+    )
+    disk_acousticlevel = forms.ChoiceField(
+        required=False,
+        choices=(('', '-----'),) + choices.ACOUSTICLVL_CHOICES,
+        label=_("Acoustic Level")
+    )
+    disk_togglesmart = forms.BooleanField(
+        initial=True,
+        label=_("Enable S.M.A.R.T."),
+        required=False,
+    )
+    disk_smartoptions = forms.CharField(
+        max_length=120,
+        label=_("S.M.A.R.T. extra options"),
+        required=False,
+    )
+
+    def __init__(self, *args, **kwargs):
+        self._disks = kwargs.pop('disks')
+        super(DiskEditBulkForm, self).__init__(*args, **kwargs)
+        self.fields['ids'].initial = ','.join([str(d.id) for d in self._disks])
+
+        """
+        Make sure all the disks have a same option for each field
+        If they are not default to empty.
+        """
+        initials = {}
+        for disk in self._disks:
+
+            for opt in (
+                'disk_hddstandby',
+                'disk_advpowermgmt',
+                'disk_acousticlevel',
+                'disk_smartoptions',
+            ):
+                if opt not in initials:
+                    initials[opt] = getattr(disk, opt)
+                elif initials[opt] != getattr(disk, opt):
+                    initials[opt] = ''
+
+            if 'disk_togglesmart' not in initials:
+                initials['disk_togglesmart'] = disk.disk_togglesmart
+            elif initials['disk_togglesmart'] != disk.disk_togglesmart:
+                initials['disk_togglesmart'] = True
+
+        for key, val in initials.items():
+            self.fields[key].initial = val
+
+    def save(self):
+
+        with transaction.commit_on_success():
+            for disk in self._disks:
+
+                for opt in (
+                    'disk_hddstandby',
+                    'disk_advpowermgmt',
+                    'disk_acousticlevel',
+                ):
+                    if self.cleaned_data.get(opt):
+                        setattr(disk, opt, self.cleaned_data.get(opt))
+
+                disk.disk_togglesmart = self.cleaned_data.get("disk_togglesmart")
+                # This is not a choice field and an empty value should reset all
+                disk.disk_smartoptions = self.cleaned_data.get("disk_smartoptions")
+                disk.save()
+        return self._disks
+
+
 class ZFSDataset_CreateForm(Form):
     dataset_name = forms.CharField(max_length=128,
         label=_('Dataset Name'))

Modified: trunk/gui/storage/urls.py
===================================================================
--- trunk/gui/storage/urls.py	2013-02-15 10:00:30 UTC (rev 13301)
+++ trunk/gui/storage/urls.py	2013-02-15 13:29:57 UTC (rev 13302)
@@ -39,6 +39,7 @@
     url(r'^replications/public-key/$', 'replications_public_key', name="storage_replications_key"),
     url(r'^replications/keyscan/$', 'replications_keyscan', name="storage_replications_keyscan"),
     url(r'^snapshots/$', 'snapshots', name="storage_snapshots"),
+    url(r'^disks/editbulk/$', 'disk_editbulk', name="storage_disk_editbulk"),
     url(r'^disks/wipe/(?P<devname>[^/]+)/$', 'disk_wipe', name="storage_disk_wipe"),
     url(r'^disks/wipe/(?P<devname>[^/]+)/progress/$', 'disk_wipe_progress', name="storage_disk_wipe_progress"),
     url(r'^dataset/create/(?P<fs>.+)/$', 'dataset_create', name="storage_dataset"),

Modified: trunk/gui/storage/views.py
===================================================================
--- trunk/gui/storage/views.py	2013-02-15 10:00:30 UTC (rev 13301)
+++ trunk/gui/storage/views.py	2013-02-15 13:29:57 UTC (rev 13302)
@@ -962,3 +962,27 @@
     return render(request, "storage/recoverykey_remove.html", {
         'form': form,
     })
+
+
+def disk_editbulk(request):
+
+    if request.method == "POST":
+        ids = request.POST.get("ids", "").split(",")
+        disks = models.Disk.objects.filter(id__in=ids)
+        form = forms.DiskEditBulkForm(request.POST, disks=disks)
+        if form.is_valid():
+            form.save()
+            return JsonResp(
+                request,
+                message=_("Disks successfully edited"))
+
+        return JsonResp(request, form=form)
+    else:
+        ids = request.GET.get("ids", "").split(",")
+        disks = models.Disk.objects.filter(id__in=ids)
+        form = forms.DiskEditBulkForm(disks=disks)
+
+    return render(request, "storage/disk_editbulk.html", {
+        'form': form,
+        'disks': ', '.join([disk.disk_name for disk in disks]),
+    })

Added: trunk/gui/templates/storage/disk_editbulk.html
===================================================================
--- trunk/gui/templates/storage/disk_editbulk.html	                        (rev 0)
+++ trunk/gui/templates/storage/disk_editbulk.html	2013-02-15 13:29:57 UTC (rev 13302)
@@ -0,0 +1,5 @@
+{% extends "freeadmin/generic_form.html" %}
+{% block form %}
+    <tr><td>{% trans "Editing the following disks" %}: {{ disks }}</td></tr>
+    {{ block.super }}
+{% endblock %}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13320
          http://freenas.svn.sourceforge.net/freenas/?rev=13320&view=rev
Author:   zippybr
Date:     2013-02-19 16:47:12 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
Disable UPS shutdown timer when it is set to shutdown in low battery

While I'm here order imports and import missing MiddlewareError

ticket: #1156

Modified Paths:
--------------
    trunk/gui/freeadmin/static/lib/js/freeadmin.js
    trunk/gui/services/forms.py

Modified: trunk/gui/freeadmin/static/lib/js/freeadmin.js
===================================================================
--- trunk/gui/freeadmin/static/lib/js/freeadmin.js	2013-02-18 16:45:13 UTC (rev 13319)
+++ trunk/gui/freeadmin/static/lib/js/freeadmin.js	2013-02-19 16:47:12 UTC (rev 13320)
@@ -382,6 +382,22 @@
 
     }
 
+    disableGeneric = function(domid, farray, checkfn) {
+
+        var box = registry.byId(domid);
+        var bool = checkfn(box);
+        for(var i=0;i<farray.length;i++) {
+            if(bool) {
+                domClass.add(registry.byId(farray[i]).domNode, ['dijitDisabled', 'dijitTextBoxDisabled', 'dijitValidationTextBoxDisabled']);
+                registry.byId(farray[i]).set('readOnly', true);
+            } else {
+                domClass.remove(registry.byId(farray[i]).domNode, ['dijitDisabled', 'dijitTextBoxDisabled', 'dijitValidationTextBoxDisabled']);
+                registry.byId(farray[i]).set('readOnly', false);
+            }
+        }
+
+    }
+
     rsyncModeToggle = function() {
 
         var select = registry.byId("id_rsync_mode");

Modified: trunk/gui/services/forms.py
===================================================================
--- trunk/gui/services/forms.py	2013-02-18 16:45:13 UTC (rev 13319)
+++ trunk/gui/services/forms.py	2013-02-19 16:47:12 UTC (rev 13320)
@@ -31,23 +31,27 @@
 import subprocess
 
 from django.core.exceptions import ObjectDoesNotExist
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext_lazy
 from django.core.validators import email_re
+from django.utils.safestring import mark_safe
+from django.utils.translation import (
+    ugettext_lazy as _, ungettext_lazy
+)
 
 from dojango import forms
 from freenasUI import choices
+from freenasUI.common import humanize_size
 from freenasUI.common.forms import ModelForm, Form
-from freenasUI.common import humanize_size
 from freenasUI.freeadmin.forms import DirectoryBrowser
+from freenasUI.middleware.exceptions import MiddlewareError
 from freenasUI.middleware.notifier import notifier
+from freenasUI.network.models import Alias, Interfaces
 from freenasUI.services import models
 from freenasUI.services.exceptions import ServiceFailed
-from freenasUI.network.models import Alias, Interfaces
 from freenasUI.storage.models import Volume, MountPoint, Disk
 from freenasUI.storage.widgets import UnixPermissionField
-from ipaddr import (IPAddress, IPNetwork, AddressValueError,
-    NetmaskValueError)
+from ipaddr import (
+    IPAddress, IPNetwork, AddressValueError, NetmaskValueError
+)
 
 log = logging.getLogger('services.form')
 
@@ -421,6 +425,14 @@
 
     def __init__(self, *args, **kwargs):
         super(UPSForm, self).__init__(*args, **kwargs)
+        self.fields['ups_shutdown'].widget.attrs['onChange'] = mark_safe(
+            "disableGeneric('id_ups_shutdown', ['id_ups_shutdowntimer'], "
+            "function(box) { if(box.get('value') == 'lowbatt') { return true; "
+            "} else { return false; } });")
+        if self.instance.id and self.instance.ups_shutdown == 'lowbatt':
+            self.fields['ups_shutdowntimer'].widget.attrs['class'] = (
+                'dijitDisabled dijitTextBoxDisabled '
+                'dijitValidationTextBoxDisabled')
         ports = filter(lambda x: x.find('.') == -1, glob.glob('/dev/cua*'))
         ports.extend(glob.glob('/dev/ugen*'))
         self.fields['ups_port'] = forms.ChoiceField(label=_("Port"))

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13342
          http://freenas.svn.sourceforge.net/freenas/?rev=13342&view=rev
Author:   zippybr
Date:     2013-02-26 12:09:15 +0000 (Tue, 26 Feb 2013)
Log Message:
-----------
Do not set geli to automatically detach (r13316 follow-up)

This would cause problems on replace/offline/etc

Revision Links:
--------------
    http://freenas.svn.sourceforge.net/freenas/?rev=13316&view=rev

Modified Paths:
--------------
    trunk/gui/middleware/notifier.py
    trunk/gui/storage/models.py

Modified: trunk/gui/middleware/notifier.py
===================================================================
--- trunk/gui/middleware/notifier.py	2013-02-25 12:21:43 UTC (rev 13341)
+++ trunk/gui/middleware/notifier.py	2013-02-26 12:09:15 UTC (rev 13342)
@@ -1369,9 +1369,6 @@
             self.__system("zpool import -R /mnt %s" % (z_name))
 
         self.__system("zpool set cachefile=/data/zfs/zpool.cache %s" % (z_name))
-        if encrypt:
-            for devname in device_list:
-                self.__system('/sbin/geli detach -l %s' % (devname))
 
     def zfs_volume_attach_group(self, volume, group, force4khack=False, encrypt=False):
         """Attach a disk group to a zfs volume"""
@@ -1396,9 +1393,6 @@
 
         # Finally, attach new groups to the zpool.
         self.__system("zpool add -f %s %s" % (z_name, z_vdev))
-        if encrypt:
-            for devname in vdevs:
-                self.__system('/sbin/geli detach -l %s' % (devname, ))
         self._reload_disk()
 
     def create_zfs_vol(self, name, size, props=None, sparse=False):
@@ -1684,8 +1678,6 @@
                 if encrypt:
                     self.__system('/sbin/geli detach %s' % (devname, ))
                 raise MiddlewareError('Disk replacement failed: "%s"' % error)
-            if encrypt:
-                self.__system('/sbin/geli detach -l %s' % (devname))
 
         if to_swap:
             self.__system('/sbin/geli onetime /dev/%s' % (to_swap))

Modified: trunk/gui/storage/models.py
===================================================================
--- trunk/gui/storage/models.py	2013-02-25 12:21:43 UTC (rev 13341)
+++ trunk/gui/storage/models.py	2013-02-26 12:09:15 UTC (rev 13342)
@@ -215,6 +215,11 @@
         else:
             n.volume_detach(self.vol_name, self.vol_fstype)
 
+        # Detach geli providers
+        if self.vol_encrypt > 0:
+            for ed in self.encrypteddisk_set.all():
+                n.geli_detach(ed.encrypted_provider)
+
         return (svcs, reloads)
 
     def delete(self, destroy=True, cascade=True):

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13344
          http://freenas.svn.sourceforge.net/freenas/?rev=13344&view=rev
Author:   zippybr
Date:     2013-02-26 18:47:53 +0000 (Tue, 26 Feb 2013)
Log Message:
-----------
Add comments reminding about geli detach -l

According to Xin the current behavior of closing providers during
disk replace, etc. is caused by a bug with ZFS's vdev handling and
eventually we need to rewrite that part to solve the problem correctly.

Requested by: delphij

Modified Paths:
--------------
    trunk/gui/middleware/notifier.py
    trunk/gui/storage/models.py

Modified: trunk/gui/middleware/notifier.py
===================================================================
--- trunk/gui/middleware/notifier.py	2013-02-26 12:13:14 UTC (rev 13343)
+++ trunk/gui/middleware/notifier.py	2013-02-26 18:47:53 UTC (rev 13344)
@@ -1369,6 +1369,7 @@
             self.__system("zpool import -R /mnt %s" % (z_name))
 
         self.__system("zpool set cachefile=/data/zfs/zpool.cache %s" % (z_name))
+        #TODO: geli detach -l
 
     def zfs_volume_attach_group(self, volume, group, force4khack=False, encrypt=False):
         """Attach a disk group to a zfs volume"""
@@ -1393,6 +1394,7 @@
 
         # Finally, attach new groups to the zpool.
         self.__system("zpool add -f %s %s" % (z_name, z_vdev))
+        #TODO: geli detach -l
         self._reload_disk()
 
     def create_zfs_vol(self, name, size, props=None, sparse=False):
@@ -1678,6 +1680,7 @@
                 if encrypt:
                     self.__system('/sbin/geli detach %s' % (devname, ))
                 raise MiddlewareError('Disk replacement failed: "%s"' % error)
+            #TODO: geli detach -l
 
         if to_swap:
             self.__system('/sbin/geli onetime /dev/%s' % (to_swap))

Modified: trunk/gui/storage/models.py
===================================================================
--- trunk/gui/storage/models.py	2013-02-26 12:13:14 UTC (rev 13343)
+++ trunk/gui/storage/models.py	2013-02-26 18:47:53 UTC (rev 13344)
@@ -216,6 +216,7 @@
             n.volume_detach(self.vol_name, self.vol_fstype)
 
         # Detach geli providers
+        # TODO: Remove once ZFS bug has been fixed for detach -l
         if self.vol_encrypt > 0:
             for ed in self.encrypteddisk_set.all():
                 n.geli_detach(ed.encrypted_provider)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13348
          http://freenas.svn.sourceforge.net/freenas/?rev=13348&view=rev
Author:   zippybr
Date:     2013-02-27 17:03:01 +0000 (Wed, 27 Feb 2013)
Log Message:
-----------
Add a new ZFS volume manager that works better for large set of disks

The main feature is being able to create a multiple vdevs at once
TODO: Enforce data vdevs of same type
      Drag-and-drop of disks to a given vdev
      Magnet effect for optimal conf

Suggested by: delphij

Modified Paths:
--------------
    trunk/gui/freeadmin/static/lib/js/freeadmin.js
    trunk/gui/freeadmin/views.py
    trunk/gui/middleware/notifier.py
    trunk/gui/storage/forms.py
    trunk/gui/storage/urls.py
    trunk/gui/storage/views.py
    trunk/gui/templates/base.html
    trunk/gui/templates/storage/volume_datagrid.html

Added Paths:
-----------
    trunk/gui/freeadmin/static/lib/js/freeadmin/VolumeManager.js
    trunk/gui/freeadmin/static/lib/js/freeadmin/templates/volumemanager.html
    trunk/gui/templates/storage/volumemanager.html

Added: trunk/gui/freeadmin/static/lib/js/freeadmin/VolumeManager.js
===================================================================
--- trunk/gui/freeadmin/static/lib/js/freeadmin/VolumeManager.js	                        (rev 0)
+++ trunk/gui/freeadmin/static/lib/js/freeadmin/VolumeManager.js	2013-02-27 17:03:01 UTC (rev 13348)
@@ -0,0 +1,440 @@
+define([
+  "dojo/_base/array",
+  "dojo/_base/declare",
+  "dojo/_base/lang",
+  "dojo/dom-attr",
+  "dojo/dom-construct",
+  "dojo/dom-style",
+  "dojo/json",
+  "dojo/on",
+  "dojo/query",
+  "dojo/topic",
+  "dijit/_Widget",
+  "dijit/_TemplatedMixin",
+  "dijit/registry",
+  "dijit/Tooltip",
+  "dijit/form/Button",
+  "dijit/form/CheckBox",
+  "dijit/form/Form",
+  "dijit/form/Select",
+  "dijit/form/TextBox",
+  "dijit/form/ToggleButton",
+  "dijit/layout/TabContainer",
+  "dijit/layout/ContentPane",
+  "dojox/layout/ResizeHandle",
+  "dojo/text!freeadmin/templates/volumemanager.html"
+  ], function(
+  array,
+  declare,
+  lang,
+  domAttr,
+  domConst,
+  domStyle,
+  json,
+  on,
+  query,
+  topic,
+  _Widget,
+  _Templated,
+  registry,
+  Tooltip,
+  Button,
+  CheckBox,
+  Form,
+  Select,
+  TextBox,
+  ToggleButton,
+  TabContainer,
+  ContentPane,
+  ResizeHandle,
+  template) {
+
+    var Disk = declare("freeadmin.Disk", [ _Widget, _Templated ], {
+      templateString: '<div class="disk" style="width: 38px; text-align: center; float: left; background-color: #eee; border: 1px solid #ddd; margin: 2px; padding: 2px;">${name}</div>',
+      name: "",
+      serial: "",
+      size: "",
+      vdev: null,
+      manager: null,
+      postCreate: function() {
+        var me = this;
+        new Tooltip({
+          showDelay: 200,
+          connectId: [me.domNode],
+          label: "Size: " + me.size
+          //label: "Size: " + me.size + "<br />Serial: " + me.serial
+        });
+        on(this.domNode, "click", function() {
+          lang.hitch(me, me.onClick)();
+        });
+      },
+      addToRow: function(row) {
+        var index = this.manager._avail_disks[this.size].indexOf(this);
+        this.manager._avail_disks[this.size].splice(index, 1);
+        this.domNode.parentNode.removeChild(this.domNode);
+        row.resize.domNode.parentNode.appendChild(this.domNode);
+        row.disks.push(this);
+        lang.hitch(this.manager, this.manager.drawAvailDisks)();
+        this.set('vdev', row);
+        this.manager._disksCheck(row);
+      },
+      remove: function() {
+        this.manager._avail_disks[this.get("size")].push(this);
+        this.domNode.parentNode.removeChild(this.domNode);
+        this.vdev.disks.splice(this.vdev.disks.indexOf(this), 1);
+        lang.hitch(this.manager, this.manager.drawAvailDisks)();
+        this.manager._disksCheck(this.vdev);
+        this.set('vdev', null);
+      },
+      onClick: function() {
+        if(this.vdev === null) {
+          for(var key in this.manager._layout) {
+            var row = this.manager._layout[key];
+            var slots = lang.hitch(row.resize, row.resize.getSlots)();
+            if(slots > row.disks.length) {
+              this.addToRow(row);
+            }
+          }
+        } else {
+          this.remove();
+        }
+      }
+    });
+
+    var VolumeManager = declare("freeadmin.VolumeManager", [ _Widget, _Templated ], {
+      templateString: template,
+      disks: "{}",
+      url: "",
+      dedup_warning: "",
+      extend: "",
+      add_label: 'Add Volume<br/ ><span style="color: red;">Existing data will be cleared</span>',
+      extend_label: "Extend Volume",
+      _layout: [],
+      _total_vdevs: null,
+      _initial_vdevs: null,
+      _form: null,
+      _avail_disks: [],
+      drawAvailDisks: function() {
+
+        domConst.empty(this.dapDisksTable);
+        for(var size in this._avail_disks) {
+          var tr = domConst.create("tr", null, this.dapDisksTable);
+          domConst.create("th", {innerHTML: size}, tr);
+          var td = domConst.create("td", null, tr);
+          var disks = this._avail_disks[size];
+          if(disks.length == 0) {
+            td.innerHTML = "(all disks in use)";
+          }
+          for(var key in disks) {
+            var disk = disks[key];
+            td.appendChild(disk.domNode);
+          }
+        }
+      },
+      postCreate: function() {
+
+        var me = this, volume_name, volume_add, okbtn, enc, encini;
+
+        this._layout = [];
+
+        this.disks = json.parse(this.disks);
+        this.extend = json.parse(this.extend);
+
+        if(!gettext) {
+          gettext = function(s) { return s; }
+        }
+
+        this._form = new Form({}, this.dapForm);
+        this._form.startup();
+
+        new TextBox({
+          name: "__all__",
+          type: "hidden"
+        }, this.dapAll);
+
+        new TextBox({
+          name: "layout-__all__",
+          type: "hidden"
+        }, this.dapLayoutAll);
+
+        volume_name = new TextBox({
+          name: "volume_name",
+          onKeyUp: function() {
+            if(this.get('value') == '') {
+              volume_add.set('disabled', false);
+            } else {
+              volume_add.set('disabled', true);
+            }
+          }
+        }, this.dapName);
+
+        volume_add = new Select({
+          name: "volume_add",
+          options: this.extend,
+          value: "",
+          onChange: function(val) {
+            if(val != '') {
+              volume_name.set('disabled', true);
+              enc.set('disabled', true);
+              encini.set('disabled', true);
+              okbtn.set('label', me.extend_label);
+            } else {
+              volume_name.set('disabled', false);
+              enc.set('disabled', false);
+              encini.set('disabled', false);
+              okbtn.set('label', me.add_label);
+            }
+          }
+        }, this.dapExtend);
+
+        new Select({
+            name: "dedup",
+            options: [
+                { label: "On", value: "on" },
+                { label: "Off", value: "off" },
+            ],
+            value: "off"
+        }, this.dapDedup);
+
+        enc = new CheckBox({
+            name: "encryption"
+        }, this.dapDiskEnc);
+
+        encini = new CheckBox({
+            name: "encryption_inirand",
+            disabled: true
+        }, this.dapDiskEncIni);
+
+        on(enc, "click", function() {
+            if(this.get("value") == "on") {
+                encini.set('disabled', false);
+            } else {
+                encini.set('disabled', true);
+            }
+        });
+
+        this._avail_disks = {};
+        for(var size in this.disks) {
+          var disks = this.disks[size];
+          this._avail_disks[size] = [];
+          for(var key in disks) {
+            this._avail_disks[size].push(new Disk({
+              manager: this,
+              name: disks[key]['dev'],
+              size: size,
+              serial: disks[key]['serial']
+            }));
+          }
+        }
+
+        lang.hitch(this, this.drawAvailDisks)();
+
+        /*
+         * Add extra row for the layout
+         */
+        var add_extra = new Button({
+          label: "Add Extra Row"
+        }, this.dapLayoutAdd);
+        on(add_extra, "click", function(evt) {
+          lang.hitch(me, me.addVdev)(true);
+        });
+
+        okbtn = new Button({
+          label: this.add_label,
+          onClick: function() {
+            lang.hitch(me, me.submit)();
+          }
+        }, this.dapAdd);
+
+        new Button({
+          label: "Cancel",
+          onClick: function() {
+            cancelDialog(this);
+          }
+        }, this.dapCancel);
+
+
+        /*
+        topic.subscribe("/dojo/resize/start", function(inst) {
+            console.log("here", inst);
+        });
+        topic.subscribe("/dojo/resize/stop", function(inst) {
+            console.log("here", inst);
+        });
+        */
+
+        this._total_vdevs = new _Widget({
+            name: "layout-TOTAL_FORMS",
+            value: 0
+        });
+        this._initial_vdevs = new _Widget({
+            name: "layout-INITIAL_FORMS",
+            value: 0
+        });
+        this._form.domNode.appendChild(this._total_vdevs.domNode);
+        this._form.domNode.appendChild(this._initial_vdevs.domNode);
+
+        this.addVdev(false);
+
+        //this._supportingWidgets.push(slider);
+
+        this.inherited(arguments);
+
+      },
+      addVdev: function(removable) {
+
+        var me = this;
+        var disks = [];
+        var vdevt = new Select({
+          options: [
+            { label: "RaidZ", value: "raidz" },
+            { label: "RaidZ2", value: "raidz2" },
+            { label: "RaidZ3", value: "raidz3" },
+            { label: "Mirror", value: "mirror" },
+            { label: "Stripe", value: "stripe" },
+            { label: "Log (ZIL)", value: "log" },
+            { label: "Cache (L2ARC)", value: "cache" }
+          ],
+        });
+
+        var tr = domConst.create("tr");
+
+        var td = domConst.create("td", null, tr);
+        domConst.place(vdevt.domNode, td);
+
+        var td = domConst.create("td", null, tr);
+        var div = domConst.create("div", null, td);
+        var div2 = domConst.create("div");
+        div.appendChild(div2);
+
+        var vdevdisks = new _Widget();
+        div.appendChild(vdevdisks.domNode);
+
+        var resize = new ResizeHandle({
+            targetContainer: div,
+            resizeAxis: "x",
+            activeResize: true,
+            minHeight: 30,
+            maxHeight: 30,
+            minWidth: 30,
+            intermediateChanges: true,
+            getSlots: function() {
+                var width = domStyle.get(this.domNode.parentNode, "width");
+                return Math.floor(width / 48);
+            },
+            onResize: function(e) {
+              var resize = this, drawer;
+              var numdisks = this.getSlots();
+              drawer = null;
+              for(var key in me._avail_disks) {
+                if(me._avail_disks[key].length > 0) {
+                  drawer = me._avail_disks[key];
+                  break;
+                }
+              }
+              if(numdisks > this.entry.disks.length && drawer) {
+                // add new disk to resizer
+                var newdisk = drawer[0].addToRow(this.entry);
+              } else if(numdisks < this.entry.disks.length) {
+                query(".disk:last-child", this.domNode.parentNode).forEach(function(node) {
+                    var disk = registry.getEnclosingWidget(node);
+                    disk.remove();
+                });
+
+              }
+              me._disksCheck(resize.entry);
+
+              lang.hitch(me, me.drawAvailDisks)();
+            }
+        }, div2);
+        domStyle.set(div, "height", "30px");
+        domStyle.set(div, "width", "30px");
+        domStyle.set(div, "position", "relative");
+        domStyle.set(div2, "position", "absolute");
+        resize.startup();
+
+        var numcol = domConst.create("td", null, tr);
+
+        if(removable) {
+
+          var me = this;
+          var td = domConst.create("td", {innerHTML: "Delete"}, tr);
+          on(td, "click", function() {
+              domConst.destroy(tr);
+          });
+
+        }
+
+        domConst.place(tr, this.dapLayoutTable);
+
+        var entry = {
+          vdev: vdevt,
+          tr: tr,
+          disks: disks,
+          resize: resize,
+          vdisks: vdevdisks,
+          numcol: numcol
+        };
+        resize.entry = entry;
+
+        on(vdevt, "change", function() {
+            me._disksCheck(entry, disks.length);
+        });
+        this._disksCheck(entry, disks.length);
+
+        this._layout.push(entry);
+
+      },
+      _disksCheck: function(entry) {
+        var check = {
+          'raidz': function(num) {
+              if(num < 3) return false;
+              return (Math.log(num - 1) / Math.LN2) % 1 == 0;
+          },
+          'raidz2': function(num) {
+              if(num < 4) return false;
+              return (Math.log(num - 2) / Math.LN2) % 1 == 0;
+          },
+          'raidz3': function(num) {
+              if(num < 5) return false;
+              return (Math.log(num - 3) / Math.LN2) % 1 == 0;
+          }
+        };
+        var vdevtype = entry.vdev.get("value");
+        var optimalf = check[vdevtype];
+        var numdisks = entry.disks.length;
+        if(optimalf !== undefined) {
+          if(optimalf(numdisks)) {
+            entry.numcol.innerHTML = numdisks + ' disks; optimal';
+          } else {
+            entry.numcol.innerHTML = numdisks + ' disks; non-optimal';
+          }
+        } else {
+          entry.numcol.innerHTML = numdisks + ' disks';
+        }
+      },
+      submit: function() {
+        /*
+         * Set all field names for layout before submit
+         * It is easier than keep track of the fields on-the-fly
+         */
+        for(var i=0;i<this._layout.length;i++) {
+            var entry = this._layout[i];
+            entry.vdev.set('name', 'layout-' + i + '-vdevtype');
+            entry.vdisks.set('name', 'layout-' + i + '-disks');
+            var disks = [];
+            for(var key in entry.disks) {
+                disks.push(entry.disks[key].get("name"));
+            }
+            entry.vdisks.set('value', disks);
+            domAttr.set(entry.vdisks.domNode.parentNode, "data-dojo-name", 'layout-' + i + '-disks');
+        }
+        this._total_vdevs.set('value', this._layout.length);
+        doSubmit({
+            url: this.url,
+            form: this._form
+        });
+      }
+    });
+    return VolumeManager;
+});

Added: trunk/gui/freeadmin/static/lib/js/freeadmin/templates/volumemanager.html
===================================================================
--- trunk/gui/freeadmin/static/lib/js/freeadmin/templates/volumemanager.html	                        (rev 0)
+++ trunk/gui/freeadmin/static/lib/js/freeadmin/templates/volumemanager.html	2013-02-27 17:03:01 UTC (rev 13348)
@@ -0,0 +1,74 @@
+<div data-dojo-attach-point="dapManager">
+<form data-dojo-attach-point="dapForm">
+  <input type="hidden" data-dojo-attach-point="dapAll" />
+  <table>
+    <tr>
+      <th>Volume Name</th>
+    </tr>
+    <tr>
+      <td>
+        <input data-dojo-attach-point="dapName" type="text" />
+      </td>
+    </tr>
+    <tr>
+      <th>Volume to extend</th>
+    </tr>
+    <tr>
+      <td>
+        <select data-dojo-attach-point="dapExtend"></select>
+      </td>
+    </tr>
+    <tr>
+      <th>Enable full disk encryption</th>
+    </tr>
+    <tr>
+      <td>
+        <input data-dojo-attach-point="dapDiskEnc" type="checkbox" />
+      </td>
+    </tr>
+    <tr>
+      <th>Initialize disks with random data</th>
+    </tr>
+    <tr>
+      <td>
+        <input data-dojo-attach-point="dapDiskEncIni" type="checkbox" />
+      </td>
+    </tr>
+    <tr>
+      <th>Deduplication</th>
+    </tr>
+    <tr>
+      <td>
+        <p>${dedup_warning}</p>
+        <input data-dojo-attach-point="dapDedup" type="checkbox" />
+      </td>
+    </tr>
+    <tr>
+      <th>Available disks</th>
+    </tr>
+    <tr>
+      <td>
+        <div data-dojo-attach-point="dapDisks">
+        <table data-dojo-attach-point="dapDisksTable">
+        </table>
+        </div>
+      </td>
+    </tr>
+    <tr>
+      <th>Volume layout</th>
+    </tr>
+    <tr>
+      <td>
+        <div data-dojo-attach-point="dapLayout">
+        <input type="hidden" data-dojo-attach-point="dapLayoutAll" />
+        <table data-dojo-attach-point="dapLayoutTable">
+        </table>
+        <button data-dojo-attach-point="dapLayoutAdd" />
+        </div>
+      </td>
+    </tr>
+  <table>
+  <button data-dojo-attach-point="dapAdd" />
+  <button data-dojo-attach-point="dapCancel" />
+</form>
+</div>

Modified: trunk/gui/freeadmin/static/lib/js/freeadmin.js
===================================================================
--- trunk/gui/freeadmin/static/lib/js/freeadmin.js	2013-02-26 20:58:09 UTC (rev 13347)
+++ trunk/gui/freeadmin/static/lib/js/freeadmin.js	2013-02-27 17:03:01 UTC (rev 13348)
@@ -56,8 +56,9 @@
     "freeadmin/tree/Tree",
     "freeadmin/ESCDialog",
     "freeadmin/Menu",
+    "freeadmin/RRDControl",
+    "freeadmin/VolumeManager",
     "freeadmin/WebShell",
-    "freeadmin/RRDControl",
     "freeadmin/tree/TreeLazy",
     "freeadmin/tree/JsonRestStore",
     "freeadmin/tree/ForestStoreModel",
@@ -129,8 +130,9 @@
     Tree,
     ESCDialog,
     fMenu,
+    RRDControl,
+    VolumeManager,
     WebShell,
-    RRDControl,
     TreeLazy,
     JsonRestStore,
     ForestStoreModel,
@@ -535,18 +537,27 @@
                 domConstruct.destroy(item);
             });
             if(data.error == true) {
-                var first = null;
-                for(key in data.errors) {
+                var first, field, dom, node;
+                for(var key in data.errors) {
 
-                    field = query("input[name="+key+"],textarea[name="+key+"],select[name="+key+"]", form.domNode);
-                    if(field.length == 0) {
-                        console.log("Form element not found: ", key);
-                        continue;
+                    dom = query("input[name="+key+"],textarea[name="+key+"],select[name="+key+"]", form.domNode);
+                    if(dom.length == 0) {
+                        dom = query("div[data-dojo-name="+key+"]", form.domNode);
+                        if(dom.length != 0) {
+                            node = dom[0];
+                        } else {
+                            console.log("Form element not found: ", key);
+                            continue;
+                        }
+                    } else {
+                        field = registry.getEnclosingWidget(dom[0]);
+                        if(field) {
+                            if(!first && field.focus)
+                                first = field;
+                            node = field.domNode;
+                        }
                     }
-                    field = registry.getEnclosingWidget(field[0]);
-                    if(!first && field.focus)
-                        first = field;
-                    var ul = domConstruct.create('ul', {style: {display: "none"}}, field.domNode.parentNode, "first");
+                    var ul = domConstruct.create('ul', {style: {display: "none"}}, node.parentNode, "first");
                     domAttr.set(ul, "class", "errorlist");
                     for(var i=0; i<data.errors[key].length;i++) {
                         var li = domConstruct.create('li', {innerHTML: data.errors[key][i]}, ul);
@@ -631,8 +642,10 @@
             attrs = {};
         }
 
-        // prevent the default submit
-        dEvent.stop(attrs.event);
+        if(attrs.event !== undefined) {
+            // prevent the default submit
+            dEvent.stop(attrs.event);
+        }
 
         query('input[type=button],input[type=submit]', attrs.form.domNode).forEach(
             function(inputElem){

Modified: trunk/gui/freeadmin/views.py
===================================================================
--- trunk/gui/freeadmin/views.py	2013-02-26 20:58:09 UTC (rev 13347)
+++ trunk/gui/freeadmin/views.py	2013-02-27 17:03:01 UTC (rev 13348)
@@ -90,6 +90,11 @@
                 error = True
 
             for name, fs in self.formsets.items():
+                fserrors = fs.non_form_errors()
+                if fserrors:
+                    error = True
+                    errors["%s-__all__" % name] = [unicode(e) for e in fserrors]
+
                 for i, form in enumerate(fs.forms):
                     if form.errors:
                         error = True

Modified: trunk/gui/middleware/notifier.py
===================================================================
--- trunk/gui/middleware/notifier.py	2013-02-26 20:58:09 UTC (rev 13347)
+++ trunk/gui/middleware/notifier.py	2013-02-27 17:03:01 UTC (rev 13348)
@@ -1315,7 +1315,7 @@
 
         want4khack = force4khack
 
-        for name, vgrp in groups.items():
+        for vgrp in groups.values():
             vgrp_type = vgrp['type']
             if vgrp_type != 'stripe':
                 z_vdev += " " + vgrp_type

Modified: trunk/gui/storage/forms.py
===================================================================
--- trunk/gui/storage/forms.py	2013-02-26 20:58:09 UTC (rev 13347)
+++ trunk/gui/storage/forms.py	2013-02-27 17:03:01 UTC (rev 13348)
@@ -39,6 +39,7 @@
 from django.core.files.storage import FileSystemStorage
 from django.db import transaction
 from django.forms import FileField
+from django.forms.formsets import BaseFormSet
 from django.http import HttpResponse, QueryDict
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _, ungettext
@@ -135,7 +136,20 @@
     return cdata
 
 
-class VolumeWizardForm(forms.Form):
+class VolumeMixin(object):
+
+    def clean_volume_name(self):
+        vname = self.cleaned_data['volume_name']
+        if vname and not re.search(r'^[a-z][-_.a-z0-9]*$', vname, re.I):
+            raise forms.ValidationError(_("The volume name must start with "
+                "letters and may include numbers, \"-\", \"_\" and \".\" ."))
+        if models.Volume.objects.filter(vol_name=vname).exists():
+            raise forms.ValidationError(_("A volume with that name already "
+                "exists."))
+        return vname
+
+
+class VolumeWizardForm(forms.Form, VolumeMixin):
     volume_name = forms.CharField(
         max_length=30,
         label=_('Volume name'),
@@ -252,16 +266,6 @@
         choices = [tuple(d) for d in choices]
         return choices
 
-    def clean_volume_name(self):
-        vname = self.cleaned_data['volume_name']
-        if vname and not re.search(r'^[a-z][-_.a-z0-9]*$', vname, re.I):
-            raise forms.ValidationError(_("The volume name must start with "
-                "letters and may include numbers, \"-\", \"_\" and \".\" ."))
-        if models.Volume.objects.filter(vol_name=vname).exists():
-            raise forms.ValidationError(_("A volume with that name already "
-                "exists."))
-        return vname
-
     def clean_group_type(self):
         len_disks = len(self.cleaned_data['volume_disks'])
         if 'volume_disks' not in self.cleaned_data or \
@@ -504,6 +508,170 @@
                 notifier().restart("cron")
 
 
+class VolumeManagerForm(VolumeMixin, forms.Form):
+    volume_name = forms.CharField(
+        max_length=30,
+        required=False)
+    volume_add = forms.CharField(
+        max_length=30,
+        required=False)
+    encryption = forms.BooleanField(
+        required=False,
+        initial=False,
+    )
+    encryption_inirand = forms.BooleanField(
+        initial=False,
+        required=False,
+    )
+    dedup = forms.ChoiceField(
+        choices=choices.ZFS_DEDUP,
+        initial="off",
+    )
+
+    def clean(self):
+        vname = (
+            self.cleaned_data.get("volume_name") or
+            self.cleaned_data.get("volume_add")
+        )
+        if not vname:
+            self._errors['__all__'] = self.error_class([
+                _("You must specify a new volume name or select an existing "
+                  "ZFS volume to append a virtual device"),
+            ])
+        else:
+            self.cleaned_data["volume_name"] = vname
+        return self.cleaned_data
+
+    def done(self, formset):
+        volume_name = self.cleaned_data.get("volume_name")
+        init_rand = self.cleaned_data.get("encryption_inirand", False)
+        if self.cleaned_data.get("encryption", False):
+            volume_encrypt = 1
+        else:
+            volume_encrypt = 0
+        dedup = self.cleaned_data.get("dedup", False)
+        force4khack = True
+
+        with transaction.commit_on_success():
+            vols = models.Volume.objects.filter(
+                vol_name=volume_name,
+                vol_fstype='ZFS')
+            if vols.count() > 0:
+                volume = vols[0]
+                add = True
+            else:
+                add = False
+                volume = models.Volume(
+                    vol_name=volume_name,
+                    vol_fstype='ZFS',
+                    vol_encrypt=volume_encrypt)
+                volume.save()
+
+                mp = models.MountPoint(
+                    mp_volume=volume,
+                    mp_path='/mnt/' + volume_name,
+                    mp_options="rw",
+                )
+                mp.save()
+            self.volume = volume
+
+            grouped = OrderedDict()
+            #FIXME: Make log as log mirror
+            for i, form in enumerate(formset):
+                grouped[i] = {
+                    'type': form.cleaned_data.get("vdevtype"),
+                    'disks': form.cleaned_data.get("disks"),
+                }
+
+            if add:
+                for gtype, group in grouped.items():
+                    notifier().zfs_volume_attach_group(
+                        volume,
+                        group,
+                        force4khack=force4khack)
+
+            else:
+                notifier().init(
+                    "volume",
+                    volume,
+                    groups=grouped,
+                    force4khack=force4khack,
+                    init_rand=init_rand,
+                )
+
+                if dedup:
+                    notifier().zfs_set_option(volume.vol_name, "dedup", dedup)
+
+                if volume.vol_fstype == 'ZFS':
+                    models.Scrub.objects.create(scrub_volume=volume)
+
+        # This must be outside transaction block to make sure the changes
+        # are committed before the call of ix-fstab
+        notifier().reload("disk")
+        # For scrub cronjob
+        if volume.vol_fstype == 'ZFS':
+            notifier().restart("cron")
+
+        return True
+
+
+class VolumeVdevForm(forms.Form):
+    vdevtype = forms.CharField(
+        max_length=20,
+    )
+    disks = forms.CharField(
+        max_length=100,
+        widget=forms.widgets.SelectMultiple(),
+    )
+
+    def clean_disks(self):
+        vdev = self.cleaned_data.get("vdevtype")
+        #TODO: Safe?
+        disks = eval(self.cleaned_data.get("disks"))
+        errmsg = _("You need at least %d disks")
+        if vdev == "mirror" and len(disks) < 2:
+            raise forms.ValidationError(errmsg % 2)
+        elif vdev == "raidz" and len(disks) < 3:
+            raise forms.ValidationError(errmsg % 3)
+        elif vdev == "raidz2" and len(disks) < 4:
+            raise forms.ValidationError(errmsg % 4)
+        elif vdev == "raidz3" and len(disks) < 5:
+            raise forms.ValidationError(errmsg % 5)
+        return disks
+
+    def clean(self):
+        if (
+            self.cleaned_data.get("vdevtype") == "log"
+            and
+            len(self.cleaned_data.get("disks")) > 1
+        ):
+            self.cleaned_data["vdevtype"] = "log mirror"
+        return self.cleaned_data
+
+
+class VdevFormSet(BaseFormSet):
+
+    def clean(self):
+        if any(self.errors):
+            # Don't bother validating the formset unless each form
+            # is valid on its own
+            return
+
+        """
+        We need to make sure at least one vdev is a
+        data vdev (non-log/cache/spare)
+        """
+        has_datavdev = False
+        for i in range(0, self.total_form_count()):
+            form = self.forms[i]
+            vdevtype = form.cleaned_data['vdevtype']
+            if vdevtype in ('mirror', 'stripe', 'raidz', 'raidz2', 'raidz3'):
+                has_datavdev = True
+                break
+        if not has_datavdev:
+            raise forms.ValidationError("You need a storage vdev")
+
+
 class VolumeImportForm(forms.Form):
 
     volume_name = forms.CharField(max_length=30, label=_('Volume name'))

Modified: trunk/gui/storage/urls.py
===================================================================
--- trunk/gui/storage/urls.py	2013-02-26 20:58:09 UTC (rev 13347)
+++ trunk/gui/storage/urls.py	2013-02-27 17:03:01 UTC (rev 13348)
@@ -53,6 +53,7 @@
     url(r'^snapshot/create/(?P<fs>[\-a-zA-Z0-9_/\.:]+)/$', 'manualsnap', name="storage_manualsnap"),
     url(r'^snapshot/clone/(?P<snapshot>[\-a-zA-Z0-9_/\.:]+@[\-a-zA-Z0-9_\.:]+)/$', 'clonesnap', name="storage_clonesnap"),
     url(r'^mountpoint/permission/(?P<path>.+)/$', 'mp_permission', name="storage_mp_permission"),
+    url(r'^volumemanager/$', 'volumemanager', name="storage_volumemanager"),
     url(r'^wizard/$', 'wizard', name="storage_wizard"),
     url(r'^wizard/progress/$', 'wizard_progress', name="storage_wizard_progress"),
     url(r'^detach/(?P<vid>\d+)/$', 'volume_detach', name="storage_detach"),

Modified: trunk/gui/storage/views.py
===================================================================
--- trunk/gui/storage/views.py	2013-02-26 20:58:09 UTC (rev 13347)
+++ trunk/gui/storage/views.py	2013-02-27 17:03:01 UTC (rev 13348)
@@ -24,6 +24,8 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 #####################################################################
+from collections import defaultdict
+import json
 import logging
 import os
 import re
@@ -32,6 +34,7 @@
 
 from django.core.servers.basehttp import FileWrapper
 from django.core.urlresolvers import reverse
+from django.forms.formsets import formset_factory
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render
 from django.utils import simplejson
@@ -110,6 +113,62 @@
     return render(request, 'storage/snapshots.html')
 
 
+def volumemanager(request):
+
+    if request.method == "POST":
+        form = forms.VolumeManagerForm(request.POST)
+        VdevFormSet = formset_factory(
+            forms.VolumeVdevForm,
+            formset=forms.VdevFormSet)
+        formset = VdevFormSet(request.POST, prefix='layout')
+        formset.form = form
+        if form.is_valid() and formset.is_valid() and form.done(formset):
+            return JsonResp(request, message=_("Volume successfully added."))
+        else:
+            return JsonResp(request, form=form, formsets={'layout': formset})
+    disks = []
+
+    # Grab disk list
+    # Root device already ruled out
+    for disk, info in notifier().get_disks().items():
+        disks.append(forms.Disk(
+            info['devname'],
+            info['capacity'],
+            serial=info.get('ident')
+        ))
+
+    # Exclude what's already added
+    used_disks = []
+    for v in models.Volume.objects.all():
+        used_disks.extend(v.get_disks())
+
+    qs = iSCSITargetExtent.objects.filter(iscsi_target_extent_type='Disk')
+    used_disks.extend([i.get_device()[5:] for i in qs])
+
+    bysize = defaultdict(list)
+    for d in list(disks):
+        if d.dev in used_disks:
+            continue
+        hsize = forms.humanize_number_si(d.size)
+        bysize[hsize].append({
+            'dev': d.dev,
+            'name': str(d),
+            'size': d.size,
+            'serial': d.serial,
+        })
+
+    qs = models.Volume.objects.filter(vol_fstype='ZFS')
+
+    return render(request, "storage/volumemanager.html", {
+        'disks': json.dumps(bysize),
+        'dedup_warning': forms.DEDUP_WARNING,
+        'extend': json.dumps(
+            [{'value': '', 'label': '-----'}] +
+            [{'label': x.vol_name, 'value': x.vol_name} for x in qs]
+        ),
+    })
+
+
 def wizard(request):
 
     if request.method == "POST":

Modified: trunk/gui/templates/base.html
===================================================================
--- trunk/gui/templates/base.html	2013-02-26 20:58:09 UTC (rev 13347)
+++ trunk/gui/templates/base.html	2013-02-27 17:03:01 UTC (rev 13348)
@@ -10,12 +10,15 @@
 </style>
 <script type="text/javascript">
     var dojoConfig = {
-        'isDebug':true,
-        'parseOnLoad':true,
-        'baseUrl':"{{ DOJANGO.DOJO_URL }}",
-        'async': true,
-	'cacheBust': '{{ cache_hash }}',
-        'packages': [
+        has: {
+          "dojo-undef-api": true
+        },
+        isDebug:true,
+        parseOnLoad:true,
+        baseUrl:"{{ DOJANGO.DOJO_URL }}",
+        async: true,
+	cacheBust: '{{ cache_hash }}',
+        packages: [
         {name: "freeadmin", location: "../../../../../static/lib/js/freeadmin"},
         {name: "dgrid", location: "../../../../../static/lib/js/dgrid"},
         {name: "xstyle", location: "../../../../../static/lib/js/xstyle"},
@@ -33,6 +36,7 @@
     <link rel="stylesheet" href="{{ DOJANGO.DOJOX_URL }}/layout/resources/ExpandoPane.css?cache={{ cache_hash }}" />
     <link rel="stylesheet" href="{{ DOJANGO.DOJOX_URL }}/grid/resources/claroGrid.css?cache={{ cache_hash }}" type="text/css" />
     <link rel="stylesheet" href="{{ DOJANGO.DOJOX_URL }}/grid/enhanced/resources/EnhancedGrid.css?cache={{ cache_hash }}" type="text/css" />
+    <link rel="stylesheet" href="{{ DOJANGO.DOJOX_URL }}/layout/resources/ResizeHandle.css?cache={{ cache_hash }}" type="text/css" />
     <link rel="stylesheet" href="{{ STATIC_URL }}css/template.css?cache={{ cache_hash }}" type="text/css" />
     <link href="{{ STATIC_URL }}favicon.ico" rel="shortcut icon" type="image/x-icon" />
 {% block dojango_header_extra %}{% endblock %}

Modified: trunk/gui/templates/storage/volume_datagrid.html
===================================================================
--- trunk/gui/templates/storage/volume_datagrid.html	2013-02-26 20:58:09 UTC (rev 13347)
+++ trunk/gui/templates/storage/volume_datagrid.html	2013-02-27 17:03:01 UTC (rev 13348)
@@ -1,6 +1,15 @@
 {% extends "freeadmin/generic_model_datagrid.html" %}
 {% block actions_static_buttons %}
 
+    <button id="newVolumeBtn" data-dojo-type="dijit.form.Button">
+    <img src="{{ STATIC_URL }}images/ui/buttons/add_volumes.png">
+    <p>{% trans "ZFS Volume Manager" %}</p>
+    <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
+        editObject('{% trans "ZFS Volume Manager"|escapejs %}', '{% url storage_volumemanager %}', [this,]);
+    </script>
+    </button>
+
+
     <button id="addVolumeBtn" data-dojo-type="dijit.form.Button">
     <img src="{{ STATIC_URL }}images/ui/buttons/add_volumes.png">
     <p>{% trans "Volume Manager" %}</p>

Added: trunk/gui/templates/storage/volumemanager.html
===================================================================
--- trunk/gui/templates/storage/volumemanager.html	                        (rev 0)
+++ trunk/gui/templates/storage/volumemanager.html	2013-02-27 17:03:01 UTC (rev 13348)
@@ -0,0 +1,2 @@
+<div data-dojo-type="freeadmin.VolumeManager" data-dojo-props="disks: '{{ disks|escapejs }}', url: '{{ request.path }}', dedup_warning: '{{ dedup_warning|escapejs }}', extend: '{{ extend|escapejs }}'">
+</div>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13350
          http://freenas.svn.sourceforge.net/freenas/?rev=13350&view=rev
Author:   zippybr
Date:     2013-02-27 19:53:37 +0000 (Wed, 27 Feb 2013)
Log Message:
-----------
Use virtual resize and use steps for the new ZFS volume manager

Prepare terrain for add/remove vdev rows by moving the resizer

Modified Paths:
--------------
    trunk/gui/freeadmin/static/lib/js/freeadmin/VolumeManager.js
    trunk/gui/templates/storage/volumemanager.html

Modified: trunk/gui/freeadmin/static/lib/js/freeadmin/VolumeManager.js
===================================================================
--- trunk/gui/freeadmin/static/lib/js/freeadmin/VolumeManager.js	2013-02-27 18:04:36 UTC (rev 13349)
+++ trunk/gui/freeadmin/static/lib/js/freeadmin/VolumeManager.js	2013-02-27 19:53:37 UTC (rev 13350)
@@ -105,6 +105,7 @@
       templateString: template,
       disks: "{}",
       url: "",
+      url_progress: "",
       dedup_warning: "",
       extend: "",
       add_label: 'Add Volume<br/ ><span style="color: red;">Existing data will be cleared</span>',
@@ -188,29 +189,29 @@
         }, this.dapExtend);
 
         new Select({
-            name: "dedup",
-            options: [
-                { label: "On", value: "on" },
-                { label: "Off", value: "off" },
-            ],
-            value: "off"
+          name: "dedup",
+          options: [
+            { label: "On", value: "on" },
+            { label: "Off", value: "off" },
+          ],
+          value: "off"
         }, this.dapDedup);
 
         enc = new CheckBox({
-            name: "encryption"
+          name: "encryption"
         }, this.dapDiskEnc);
 
         encini = new CheckBox({
-            name: "encryption_inirand",
-            disabled: true
+          name: "encryption_inirand",
+          disabled: true
         }, this.dapDiskEncIni);
 
         on(enc, "click", function() {
-            if(this.get("value") == "on") {
-                encini.set('disabled', false);
-            } else {
-                encini.set('disabled', true);
-            }
+          if(this.get("value") == "on") {
+            encini.set('disabled', false);
+          } else {
+            encini.set('disabled', true);
+          }
         });
 
         this._avail_disks = {};
@@ -312,15 +313,40 @@
 
         var resize = new ResizeHandle({
             targetContainer: div,
-            resizeAxis: "x",
-            activeResize: true,
+            resizeAxis: "xy",
+            activeResize: false,
+            animateSizing: false, // Animated cause problem to get the size in onResize
+            _checkConstraints: function(newW, newH){
+              var perNode = 48;
+              var perRow = 30;
+              var numRows = (newH / perRow);
+              var floorR = Math.floor(numRows);
+
+              /*
+               * Make sure adding rows will keep the original width size
+               */
+              if(numRows - floorR < 0.6 && this.startSize.h == floorR * perRow) {
+                newH = floorR * perRow;
+                var numNodes = newW / perNode;
+                var floor = Math.floor(numNodes);
+                if(numNodes - floor < 0.5) {
+                  newW = floor * perNode;
+                } else {
+                  newW = (floor + 1) * perNode;
+                }
+              } else {
+                newH = (floorR + 1) * perRow;
+                newW = this.startSize.w;
+              }
+
+              return { w: newW, h: newH };
+            },
             minHeight: 30,
-            maxHeight: 30,
             minWidth: 30,
             intermediateChanges: true,
             getSlots: function() {
-                var width = domStyle.get(this.domNode.parentNode, "width");
-                return Math.floor(width / 48);
+              var width = domStyle.get(this.targetDomNode, "width");
+              return Math.floor(width / 48);
             },
             onResize: function(e) {
               var resize = this, drawer;
@@ -333,13 +359,17 @@
                 }
               }
               if(numdisks > this.entry.disks.length && drawer) {
-                // add new disk to resizer
-                var newdisk = drawer[0].addToRow(this.entry);
+                for(var i=this.entry.disks.length;i<numdisks && drawer.length > 0;i++) {
+                  // add new disk to resizer
+                  var newdisk = drawer[0].addToRow(this.entry);
+                }
               } else if(numdisks < this.entry.disks.length) {
+                for(var i=numdisks;i<this.entry.disks.length;i++) {
                 query(".disk:last-child", this.domNode.parentNode).forEach(function(node) {
-                    var disk = registry.getEnclosingWidget(node);
-                    disk.remove();
+                  var disk = registry.getEnclosingWidget(node);
+                  disk.remove();
                 });
+                }
 
               }
               me._disksCheck(resize.entry);
@@ -361,8 +391,8 @@
           var td = domConst.create("td", {innerHTML: "Delete"}, tr);
           on(td, "click", function() {
             while(true) {
-                if(this.entry.disks.length == 0) break;
-                var disk = this.entry.disks[0].remove();
+              if(this.entry.disks.length == 0) break;
+              var disk = this.entry.disks[0].remove();
             }
             domConst.destroy(tr);
           });
@@ -393,16 +423,16 @@
       _disksCheck: function(entry) {
         var check = {
           'raidz': function(num) {
-              if(num < 3) return false;
-              return (Math.log(num - 1) / Math.LN2) % 1 == 0;
+            if(num < 3) return false;
+            return (Math.log(num - 1) / Math.LN2) % 1 == 0;
           },
           'raidz2': function(num) {
-              if(num < 4) return false;
-              return (Math.log(num - 2) / Math.LN2) % 1 == 0;
+            if(num < 4) return false;
+            return (Math.log(num - 2) / Math.LN2) % 1 == 0;
           },
           'raidz3': function(num) {
-              if(num < 5) return false;
-              return (Math.log(num - 3) / Math.LN2) % 1 == 0;
+            if(num < 5) return false;
+            return (Math.log(num - 3) / Math.LN2) % 1 == 0;
           }
         };
         var vdevtype = entry.vdev.get("value");
@@ -424,20 +454,21 @@
          * It is easier than keep track of the fields on-the-fly
          */
         for(var i=0;i<this._layout.length;i++) {
-            var entry = this._layout[i];
-            entry.vdev.set('name', 'layout-' + i + '-vdevtype');
-            entry.vdisks.set('name', 'layout-' + i + '-disks');
-            var disks = [];
-            for(var key in entry.disks) {
-                disks.push(entry.disks[key].get("name"));
-            }
-            entry.vdisks.set('value', disks);
-            domAttr.set(entry.vdisks.domNode.parentNode, "data-dojo-name", 'layout-' + i + '-disks');
+          var entry = this._layout[i];
+          entry.vdev.set('name', 'layout-' + i + '-vdevtype');
+          entry.vdisks.set('name', 'layout-' + i + '-disks');
+          var disks = [];
+          for(var key in entry.disks) {
+            disks.push(entry.disks[key].get("name"));
+          }
+          entry.vdisks.set('value', disks);
+          domAttr.set(entry.vdisks.domNode.parentNode, "data-dojo-name", 'layout-' + i + '-disks');
         }
         this._total_vdevs.set('value', this._layout.length);
         doSubmit({
-            url: this.url,
-            form: this._form
+          url: this.url,
+          form: this._form,
+          progressbar: this.url_progress
         });
       }
     });

Modified: trunk/gui/templates/storage/volumemanager.html
===================================================================
--- trunk/gui/templates/storage/volumemanager.html	2013-02-27 18:04:36 UTC (rev 13349)
+++ trunk/gui/templates/storage/volumemanager.html	2013-02-27 19:53:37 UTC (rev 13350)
@@ -1,2 +1,2 @@
-<div data-dojo-type="freeadmin.VolumeManager" data-dojo-props="disks: '{{ disks|escapejs }}', url: '{{ request.path }}', dedup_warning: '{{ dedup_warning|escapejs }}', extend: '{{ extend|escapejs }}'">
+<div data-dojo-type="freeadmin.VolumeManager" data-dojo-props="disks: '{{ disks|escapejs }}', url: '{{ request.path }}', url_progress: '{% url storage_wizard_progress %}', dedup_warning: '{{ dedup_warning|escapejs }}', extend: '{{ extend|escapejs }}'">
 </div>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13375
          http://freenas.svn.sourceforge.net/freenas/?rev=13375&view=rev
Author:   zippybr
Date:     2013-03-01 11:19:15 +0000 (Fri, 01 Mar 2013)
Log Message:
-----------
Better size for dialog and avail disks rows

Modified Paths:
--------------
    trunk/gui/freeadmin/static/lib/js/freeadmin/VolumeManager.js
    trunk/gui/templates/storage/volume_datagrid.html

Modified: trunk/gui/freeadmin/static/lib/js/freeadmin/VolumeManager.js
===================================================================
--- trunk/gui/freeadmin/static/lib/js/freeadmin/VolumeManager.js	2013-03-01 06:42:32 UTC (rev 13374)
+++ trunk/gui/freeadmin/static/lib/js/freeadmin/VolumeManager.js	2013-03-01 11:19:15 UTC (rev 13375)
@@ -106,7 +106,7 @@
     });
 
     var Vdev = declare("freeadmin.Vdev", [ _Widget, _Templated ], {
-      templateString: '<tr><td data-dojo-attach-point="dapVdevType"></td><td><div class="vdev" data-dojo-attach-point="dapResMain" style="width: 5px; position: relative"><div data-dojo-attach-point="dapRes" style="position: absolute;"></div></div></td><td data-dojo-attach-point="dapNumCol"></td><td data-dojo-attach-point="dapDelete">Delete</td></tr>',
+      templateString: '<tr><td data-dojo-attach-point="dapVdevType" style="width: 110px;"></td><td><div class="vdev" data-dojo-attach-point="dapResMain" style="width: 5px; position: relative;"><div data-dojo-attach-point="dapRes" style="position: absolute;"></div></div></td><td data-dojo-attach-point="dapNumCol"></td><td data-dojo-attach-point="dapDelete">Delete</td></tr>',
       widgetsInTemplate: true,
       numDisks: 0,
       type: "",
@@ -285,6 +285,7 @@
         domConst.empty(this.dapDisksTable);
         for(var size in this._avail_disks) {
           var tr = domConst.create("tr", null, this.dapDisksTable);
+          domStyle.set(tr, "height", (PER_NODE_HEIGHT + 2) + "px");
           domConst.create("th", {innerHTML: size}, tr);
           var td = domConst.create("td", null, tr);
           var disks = this._avail_disks[size];

Modified: trunk/gui/templates/storage/volume_datagrid.html
===================================================================
--- trunk/gui/templates/storage/volume_datagrid.html	2013-03-01 06:42:32 UTC (rev 13374)
+++ trunk/gui/templates/storage/volume_datagrid.html	2013-03-01 11:19:15 UTC (rev 13375)
@@ -5,7 +5,12 @@
     <img src="{{ STATIC_URL }}images/ui/buttons/add_volumes.png">
     <p>{% trans "ZFS Volume Manager" %}</p>
     <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
-        editObject('{% trans "ZFS Volume Manager"|escapejs %}', '{% url storage_volumemanager %}', [this,]);
+        commonDialog({
+	  style: "min-width: 600px; max-width: 75%;max-height:70%;background-color:white;overflow:auto;",
+	  name: '{% trans "ZFS Volume Manager"|escapejs %}',
+	  url: '{% url storage_volumemanager %}',
+	  nodes: [this,]
+	});
     </script>
     </button>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13383
          http://freenas.svn.sourceforge.net/freenas/?rev=13383&view=rev
Author:   zippybr
Date:     2013-03-04 12:58:45 +0000 (Mon, 04 Mar 2013)
Log Message:
-----------
Fix alert system to work with translation

Modified Paths:
--------------
    trunk/gui/freeadmin/utils.py
    trunk/gui/tools/alert.py

Modified: trunk/gui/freeadmin/utils.py
===================================================================
--- trunk/gui/freeadmin/utils.py	2013-03-04 12:46:11 UTC (rev 13382)
+++ trunk/gui/freeadmin/utils.py	2013-03-04 12:58:45 UTC (rev 13383)
@@ -27,7 +27,10 @@
 import logging
 
 from django.db.models import CASCADE
+from django.utils import translation
 
+from freenasUI.system.models import Settings
+
 log = logging.getLogger('freeadmin.utils')
 
 
@@ -67,3 +70,8 @@
             reldict[related.model._meta.verbose_name] = list(qs)
 
     return reldict, relnum
+
+
+def set_language():
+    language = Settings.objects.order_by('-id')[0].stg_language
+    translation.activate(language)

Modified: trunk/gui/tools/alert.py
===================================================================
--- trunk/gui/tools/alert.py	2013-03-04 12:46:11 UTC (rev 13382)
+++ trunk/gui/tools/alert.py	2013-03-04 12:58:45 UTC (rev 13383)
@@ -46,6 +46,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from freenasUI.common.system import send_mail
+from freenasUI.freeadmin.utils import set_language
 from freenasUI.middleware.notifier import notifier
 from freenasUI.services.models import PluginsJail
 from freenasUI.storage.models import Volume
@@ -69,7 +70,7 @@
         return str(self._message)
 
     def __unicode__(self):
-        return unicode(self._message)
+        return self._message.decode('utf8')
 
 
 class Alert(object):
@@ -251,6 +252,7 @@
         self.__s.close()
 
 if __name__ == '__main__':
+    set_language()
     alert = Alert()
     alert.perform()
     alert.email()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13385
          http://freenas.svn.sourceforge.net/freenas/?rev=13385&view=rev
Author:   zippybr
Date:     2013-03-05 16:40:54 +0000 (Tue, 05 Mar 2013)
Log Message:
-----------
Do not allow different disk sizes in same vdev (even manually)

Modified Paths:
--------------
    trunk/gui/freeadmin/static/lib/js/freeadmin/VolumeManager.js
    trunk/gui/freeadmin/static/lib/js/freeadmin/templates/volumemanager.html
    trunk/gui/templates/base.html

Modified: trunk/gui/freeadmin/static/lib/js/freeadmin/VolumeManager.js
===================================================================
--- trunk/gui/freeadmin/static/lib/js/freeadmin/VolumeManager.js	2013-03-04 17:49:26 UTC (rev 13384)
+++ trunk/gui/freeadmin/static/lib/js/freeadmin/VolumeManager.js	2013-03-05 16:40:54 UTC (rev 13385)
@@ -1,5 +1,6 @@
 define([
   "dojo/_base/array",
+  "dojo/_base/connect",
   "dojo/_base/declare",
   "dojo/_base/lang",
   "dojo/dom-attr",
@@ -22,9 +23,11 @@
   "dijit/layout/TabContainer",
   "dijit/layout/ContentPane",
   "dojox/layout/ResizeHandle",
+  "dojox/widget/Toaster",
   "dojo/text!freeadmin/templates/volumemanager.html"
   ], function(
   array,
+  connect,
   declare,
   lang,
   domAttr,
@@ -47,6 +50,7 @@
   TabContainer,
   ContentPane,
   ResizeHandle,
+  Toaster,
   template) {
 
     var PER_NODE_WIDTH = 48;
@@ -72,14 +76,25 @@
         });
       },
       addToRow: function(row) {
-        var index = this.manager._avail_disks[this.size].indexOf(this);
-        this.manager._avail_disks[this.size].splice(index, 1);
-        this.domNode.parentNode.removeChild(this.domNode);
-        row.resize.domNode.parentNode.appendChild(this.domNode);
-        row.disks.push(this);
-        lang.hitch(this.manager, this.manager.drawAvailDisks)();
-        this.set('vdev', row);
-        this.manager._disksCheck(row);
+        try {
+          row.validate(this);
+          var index = this.manager._avail_disks[this.size].indexOf(this);
+          this.manager._avail_disks[this.size].splice(index, 1);
+          this.domNode.parentNode.removeChild(this.domNode);
+          row.resize.domNode.parentNode.appendChild(this.domNode);
+          row.disks.push(this);
+          lang.hitch(this.manager, this.manager.drawAvailDisks)();
+          this.set('vdev', row);
+          this.manager._disksCheck(row);
+        } catch(e) {
+          var me = this;
+          connect.publish("volumeManager", {
+            message: e.message,
+            type: "fatal",
+            duration: 50
+          });
+
+        }
       },
       remove: function() {
         this.manager._avail_disks[this.get("size")].push(this);
@@ -115,6 +130,19 @@
       can_delete: false,
       vdev: null,
       manager: null,
+      validate: function(disk) {
+        var valid = true;
+        for(var key in this.disks) {
+          var each = this.disks[key];
+          if(each.size != disk.size) {
+            valid = false;
+            break;
+          }
+        }
+        if(valid === false) {
+          throw new Object({message: "Disk size mismatch"});
+        }
+      },
       getChildren: function() {
         // This needs investigating
         // For some reason chidlren are not retrieved automatically
@@ -475,6 +503,13 @@
         this._form.domNode.appendChild(this._total_vdevs.domNode);
         this._form.domNode.appendChild(this._initial_vdevs.domNode);
 
+        new Toaster({
+          messageTopic: "volumeManager",
+          separator: "<hr/>",
+          positionDirection: "br-left",
+          duration: "0"
+        }, this.dapToaster);
+
         this.addVdev({can_delete: false});
 
         //this._supportingWidgets.push(slider);

Modified: trunk/gui/freeadmin/static/lib/js/freeadmin/templates/volumemanager.html
===================================================================
--- trunk/gui/freeadmin/static/lib/js/freeadmin/templates/volumemanager.html	2013-03-04 17:49:26 UTC (rev 13384)
+++ trunk/gui/freeadmin/static/lib/js/freeadmin/templates/volumemanager.html	2013-03-05 16:40:54 UTC (rev 13385)
@@ -70,5 +70,6 @@
   <table>
   <button data-dojo-attach-point="dapAdd" />
   <button data-dojo-attach-point="dapCancel" />
+  <div data-dojo-attach-point="dapToaster"></div>
 </form>
 </div>

Modified: trunk/gui/templates/base.html
===================================================================
--- trunk/gui/templates/base.html	2013-03-04 17:49:26 UTC (rev 13384)
+++ trunk/gui/templates/base.html	2013-03-05 16:40:54 UTC (rev 13385)
@@ -37,6 +37,7 @@
     <link rel="stylesheet" href="{{ DOJANGO.DOJOX_URL }}/grid/resources/claroGrid.css?cache={{ cache_hash }}" type="text/css" />
     <link rel="stylesheet" href="{{ DOJANGO.DOJOX_URL }}/grid/enhanced/resources/EnhancedGrid.css?cache={{ cache_hash }}" type="text/css" />
     <link rel="stylesheet" href="{{ DOJANGO.DOJOX_URL }}/layout/resources/ResizeHandle.css?cache={{ cache_hash }}" type="text/css" />
+    <link rel="stylesheet" href="{{ DOJANGO.DOJOX_URL }}/widget/Toaster/Toaster.css?cache={{ cache_hash }}" type="text/css" />
     <link rel="stylesheet" href="{{ STATIC_URL }}css/template.css?cache={{ cache_hash }}" type="text/css" />
     <link href="{{ STATIC_URL }}favicon.ico" rel="shortcut icon" type="image/x-icon" />
 {% block dojango_header_extra %}{% endblock %}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13421
          http://freenas.svn.sourceforge.net/freenas/?rev=13421&view=rev
Author:   zippybr
Date:     2013-03-11 14:19:42 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
django.conf.urls.defaults is deprecated

For reference: https://docs.djangoproject.com/en/dev/releases/1.4/#request-exceptions-are-now-always-logged

Modified Paths:
--------------
    trunk/gui/account/urls.py
    trunk/gui/jails/urls.py
    trunk/gui/network/urls.py
    trunk/gui/plugins/urls.py
    trunk/gui/reporting/urls.py
    trunk/gui/services/urls.py
    trunk/gui/sharing/urls.py
    trunk/gui/storage/urls.py
    trunk/gui/system/urls.py
    trunk/gui/urls.py

Modified: trunk/gui/account/urls.py
===================================================================
--- trunk/gui/account/urls.py	2013-03-11 12:41:30 UTC (rev 13420)
+++ trunk/gui/account/urls.py	2013-03-11 14:19:42 UTC (rev 13421)
@@ -25,7 +25,7 @@
 #
 #####################################################################
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.contrib.auth.views import logout
 
 from freenasUI.common.system import get_sw_name

Modified: trunk/gui/jails/urls.py
===================================================================
--- trunk/gui/jails/urls.py	2013-03-11 12:41:30 UTC (rev 13420)
+++ trunk/gui/jails/urls.py	2013-03-11 14:19:42 UTC (rev 13421)
@@ -25,7 +25,7 @@
 #
 #####################################################################
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('freenasUI.jails.views',
     url(r'^home/$', 'jails_home', name="jails_home"),

Modified: trunk/gui/network/urls.py
===================================================================
--- trunk/gui/network/urls.py	2013-03-11 12:41:30 UTC (rev 13420)
+++ trunk/gui/network/urls.py	2013-03-11 14:19:42 UTC (rev 13421)
@@ -25,7 +25,7 @@
 #
 #####################################################################
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('freenasUI.network.views',
     url(r'^home/$', 'network', name='network_home'),

Modified: trunk/gui/plugins/urls.py
===================================================================
--- trunk/gui/plugins/urls.py	2013-03-11 12:41:30 UTC (rev 13420)
+++ trunk/gui/plugins/urls.py	2013-03-11 14:19:42 UTC (rev 13421)
@@ -25,7 +25,7 @@
 #
 #####################################################################
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from freenasUI.plugins.forms import (JailInstallWizard, JailUpdateWizard,
     PBITemporaryLocationForm, JailInfoForm, JailPBIUploadForm)

Modified: trunk/gui/reporting/urls.py
===================================================================
--- trunk/gui/reporting/urls.py	2013-03-11 12:41:30 UTC (rev 13420)
+++ trunk/gui/reporting/urls.py	2013-03-11 14:19:42 UTC (rev 13421)
@@ -25,7 +25,7 @@
 #
 #####################################################################
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('freenasUI.reporting.views',
     url(r'^$', 'index', name="reporting_index"),

Modified: trunk/gui/services/urls.py
===================================================================
--- trunk/gui/services/urls.py	2013-03-11 12:41:30 UTC (rev 13420)
+++ trunk/gui/services/urls.py	2013-03-11 14:19:42 UTC (rev 13421)
@@ -25,7 +25,7 @@
 #
 #####################################################################
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('freenasUI.services.views',
     url(r'^index/$', 'index', name="services_home"),

Modified: trunk/gui/sharing/urls.py
===================================================================
--- trunk/gui/sharing/urls.py	2013-03-11 12:41:30 UTC (rev 13420)
+++ trunk/gui/sharing/urls.py	2013-03-11 14:19:42 UTC (rev 13421)
@@ -25,7 +25,7 @@
 #
 #####################################################################
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('freenasUI.sharing.views',
     url(r'^home/$', 'home', name="sharing_home"),

Modified: trunk/gui/storage/urls.py
===================================================================
--- trunk/gui/storage/urls.py	2013-03-11 12:41:30 UTC (rev 13420)
+++ trunk/gui/storage/urls.py	2013-03-11 14:19:42 UTC (rev 13421)
@@ -25,7 +25,7 @@
 #
 #####################################################################
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from freenasUI.storage.forms import (
     AutoImportWizard, VolumeAutoImportForm, AutoImportChoiceForm,

Modified: trunk/gui/system/urls.py
===================================================================
--- trunk/gui/system/urls.py	2013-03-11 12:41:30 UTC (rev 13420)
+++ trunk/gui/system/urls.py	2013-03-11 14:19:42 UTC (rev 13421)
@@ -25,7 +25,7 @@
 #
 #####################################################################
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from freenasUI.system.forms import (FirmwareWizard,
     FirmwareTemporaryLocationForm, FirmwareUploadForm)
 

Modified: trunk/gui/urls.py
===================================================================
--- trunk/gui/urls.py	2013-03-11 12:41:30 UTC (rev 13420)
+++ trunk/gui/urls.py	2013-03-11 14:19:42 UTC (rev 13421)
@@ -26,7 +26,7 @@
 #####################################################################
 import os
 
-from django.conf.urls.defaults import include, patterns, url
+from django.conf.urls import include, patterns, url
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.views.static import serve
 from django.conf import settings

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.