Reporting: use mode instead of perms

4 files changed, 181 insertions, 13 deletions

diff --git a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
index 839925107..88c3172b2 100644
--- a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
+++ b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
@@ -148,7 +148,7 @@ class DjangoORM(StorageBase):
                     target_dict = dict(
                         owner=entry.get('owner', default="root"),
                         group=entry.get('group', default="root"),
-                        perms=entry.get('mode', default=entry.get('perms', default=""))
+                        mode=entry.get('mode', default=entry.get('perms', default=""))
                     )
                     fperm, created = FilePerms.objects.get_or_create(**target_dict)
                     act_dict['target_perms'] = fperm
@@ -156,7 +156,7 @@ class DjangoORM(StorageBase):
                     current_dict = dict(
                         owner=entry.get('current_owner', default=""),
                         group=entry.get('current_group', default=""),
-                        perms=entry.get('current_mode',
+                        mode=entry.get('current_mode',
                             default=entry.get('current_perms', default=""))
                     )
                     fperm, created = FilePerms.objects.get_or_create(**current_dict)
@@ -292,7 +292,7 @@ class DjangoORM(StorageBase):
             raise PluginExecutionError
         entry = result[0]
         ret = []
-        for p_entry in ('owner', 'group', 'perms'):
+        for p_entry in ('owner', 'group', 'mode'):
             this_entry = getattr(entry.current_perms, p_entry)
             if this_entry == '':
                 ret.append(getattr(entry.target_perms, p_entry))
diff --git a/src/lib/Bcfg2/Reporting/migrations/0002_convert_perms_to_mode.py b/src/lib/Bcfg2/Reporting/migrations/0002_convert_perms_to_mode.py
new file mode 100644
index 000000000..7c39b2d07
--- /dev/null
+++ b/src/lib/Bcfg2/Reporting/migrations/0002_convert_perms_to_mode.py
@@ -0,0 +1,168 @@
+# -*- 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):
+        # Removing unique constraint on 'FilePerms', fields ['owner', 'perms', 'group']
+        db.delete_unique('Reporting_fileperms', ['owner', 'perms', 'group'])
+
+        # Renaming field 'FilePerms.perms' to 'FilePerms.mode'
+        db.rename_column('Reporting_fileperms', 'perms', 'mode')
+
+        # Adding unique constraint on 'FilePerms', fields ['owner', 'group', 'mode']
+        db.create_unique('Reporting_fileperms', ['owner', 'group', 'mode'])
+
+
+    def backwards(self, orm):
+        # Removing unique constraint on 'FilePerms', fields ['owner', 'group', 'mode']
+        db.delete_unique('Reporting_fileperms', ['owner', 'group', 'mode'])
+
+        # Renaming field 'FilePerms.mode' to 'FilePerms.perms'
+        db.rename_column('Reporting_fileperms', 'mode', 'perms')
+
+        # Adding unique constraint on 'FilePerms', fields ['owner', 'perms', 'group']
+        db.create_unique('Reporting_fileperms', ['owner', 'perms', 'group'])
+
+
+    models = {
+        'Reporting.actionentry': {
+            'Meta': {'ordering': "('state', 'name')", 'object_name': 'ActionEntry'},
+            'exists': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'hash_key': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'}),
+            'output': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'state': ('django.db.models.fields.IntegerField', [], {}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'check'", 'max_length': '128'})
+        },
+        'Reporting.bundle': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Bundle'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
+        },
+        'Reporting.client': {
+            'Meta': {'object_name': 'Client'},
+            'creation': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'current_interaction': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parent_client'", 'null': 'True', 'to': "orm['Reporting.Interaction']"}),
+            'expiration': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'Reporting.deviceentry': {
+            'Meta': {'ordering': "('state', 'name')", 'object_name': 'DeviceEntry', '_ormbases': ['Reporting.PathEntry']},
+            'current_major': ('django.db.models.fields.IntegerField', [], {}),
+            'current_minor': ('django.db.models.fields.IntegerField', [], {}),
+            'device_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}),
+            'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'primary_key': 'True'}),
+            'target_major': ('django.db.models.fields.IntegerField', [], {}),
+            'target_minor': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'Reporting.failureentry': {
+            'Meta': {'object_name': 'FailureEntry'},
+            'entry_type': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'hash_key': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'message': ('django.db.models.fields.TextField', [], {}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'})
+        },
+        'Reporting.fileacl': {
+            'Meta': {'object_name': 'FileAcl'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'})
+        },
+        'Reporting.fileperms': {
+            'Meta': {'unique_together': "(('owner', 'group', 'mode'),)", 'object_name': 'FilePerms'},
+            'group': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mode': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'owner': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'Reporting.group': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Group'},
+            'bundles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['Reporting.Bundle']", 'symmetrical': 'False'}),
+            'category': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['Reporting.Group']", 'symmetrical': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'profile': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'public': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'Reporting.interaction': {
+            'Meta': {'ordering': "['-timestamp']", 'unique_together': "(('client', 'timestamp'),)", 'object_name': 'Interaction'},
+            'actions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['Reporting.ActionEntry']", 'symmetrical': 'False'}),
+            'bad_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'bundles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['Reporting.Bundle']", 'symmetrical': 'False'}),
+            'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'interactions'", 'to': "orm['Reporting.Client']"}),
+            'extra_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'failures': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['Reporting.FailureEntry']", 'symmetrical': 'False'}),
+            'good_count': ('django.db.models.fields.IntegerField', [], {}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['Reporting.Group']", 'symmetrical': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'packages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['Reporting.PackageEntry']", 'symmetrical': 'False'}),
+            'paths': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['Reporting.PathEntry']", 'symmetrical': 'False'}),
+            'profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['Reporting.Group']"}),
+            'repo_rev_code': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'server': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'services': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['Reporting.ServiceEntry']", 'symmetrical': 'False'}),
+            'state': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'timestamp': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'total_count': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'Reporting.linkentry': {
+            'Meta': {'ordering': "('state', 'name')", 'object_name': 'LinkEntry', '_ormbases': ['Reporting.PathEntry']},
+            'current_path': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}),
+            'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'primary_key': 'True'}),
+            'target_path': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'})
+        },
+        'Reporting.packageentry': {
+            'Meta': {'ordering': "('state', 'name')", 'object_name': 'PackageEntry'},
+            'current_version': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'exists': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'hash_key': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'}),
+            'state': ('django.db.models.fields.IntegerField', [], {}),
+            'target_version': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '1024'}),
+            'verification_details': ('django.db.models.fields.TextField', [], {'default': "''"})
+        },
+        'Reporting.pathentry': {
+            'Meta': {'ordering': "('state', 'name')", 'object_name': 'PathEntry'},
+            'acls': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['Reporting.FileAcl']", 'symmetrical': 'False'}),
+            'current_perms': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['Reporting.FilePerms']"}),
+            'detail_type': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'details': ('django.db.models.fields.TextField', [], {'default': "''"}),
+            'exists': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'hash_key': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'}),
+            'path_type': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'state': ('django.db.models.fields.IntegerField', [], {}),
+            'target_perms': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['Reporting.FilePerms']"})
+        },
+        'Reporting.performance': {
+            'Meta': {'object_name': 'Performance'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'interaction': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'performance_items'", 'to': "orm['Reporting.Interaction']"}),
+            'metric': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'value': ('django.db.models.fields.DecimalField', [], {'max_digits': '32', 'decimal_places': '16'})
+        },
+        'Reporting.serviceentry': {
+            'Meta': {'ordering': "('state', 'name')", 'object_name': 'ServiceEntry'},
+            'current_status': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128'}),
+            'exists': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'hash_key': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'}),
+            'state': ('django.db.models.fields.IntegerField', [], {}),
+            'target_status': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128'})
+        }
+    }
+
+    complete_apps = ['Reporting']
diff --git a/src/lib/Bcfg2/Reporting/models.py b/src/lib/Bcfg2/Reporting/models.py
index 3b8ccc52e..f54a76322 100644
--- a/src/lib/Bcfg2/Reporting/models.py
+++ b/src/lib/Bcfg2/Reporting/models.py
@@ -291,14 +291,14 @@ class Bundle(models.Model):
 class FilePerms(models.Model):
     owner = models.CharField(max_length=128)
     group = models.CharField(max_length=128)
-    perms = models.CharField(max_length=128)
+    mode = models.CharField(max_length=128)
 
     class Meta:
-        unique_together = ('owner', 'group', 'perms')
+        unique_together = ('owner', 'group', 'mode')
 
     def empty(self):
         """Return true if we have no real data"""
-        if self.owner or self.group or self.perms:
+        if self.owner or self.group or self.mode:
             return False
         else:
             return True
@@ -522,10 +522,10 @@ class PathEntry(SuccessEntry):
 
     ENTRY_TYPE = r"Path"
 
-    def perms_problem(self):
+    def mode_problem(self):
         if self.current_perms.empty():
             return False
-        elif self.target_perms.perms != self.current_perms.perms:
+        elif self.target_perms.mode != self.current_perms.mode:
             return True
         else:
             return False
@@ -553,8 +553,8 @@ class PathEntry(SuccessEntry):
         rv = super(PathEntry, self).short_list()
         if self.is_extra():
             return rv
-        if self.perms_problem():
-            rv.append("File permissions")
+        if self.modes_problem():
+            rv.append("File mode")
         if self.detail_type == PathEntry.DETAIL_PRUNED:
             rv.append("Directory has extra files")
         elif self.detail_type != PathEntry.DETAIL_UNUSED:
diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/item.html b/src/lib/Bcfg2/Reporting/templates/config_items/item.html
index 1eb2956f4..737760252 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/item.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/item.html
@@ -45,11 +45,11 @@ div.entry_list h3 {
   {% endif %}
 
 {# Really need a better test here #}
-{% if item.perms_problem or item.status_problem or item.linkentry.link_problem or item.version_problem %}
+{% if item.mdoe_problem or item.status_problem or item.linkentry.link_problem or item.version_problem %}
   <table class='entry_list'>
       <tr id='table_list_header'>
           <td style='text-align: right;'>Problem Type</td><td>Expected</td><td style='border-bottom: 1px solid #98DBCC;'>Found</td></tr>
-  {% if item.perms_problem %}
+  {% if item.mode_problem %}
       {% if item.current_perms.owner %}
       <tr><td style='text-align: right'><b>Owner</b></td><td>{{item.target_perms.owner}}</td>
           <td>{{item.current_perms.owner}}</td></tr>
@@ -59,7 +59,7 @@ div.entry_list h3 {
           <td>{{item.current_perms.group}}</td></tr>
       {% endif %}
       {% if item.current_perms.mode%}
-      <tr><td style='text-align: right'><b>Perms</b></td><td>{{item.target_perms.perms}}</td>
+      <tr><td style='text-align: right'><b>Mode</b></td><td>{{item.target_perms.mode}}</td>
           <td>{{item.current_perms.mode}}</td></tr>
       {% endif %}
   {% endif %}