Working on migrations

Makefile

@@ -30,7 +30,7 @@ runserver:
 
 dbchange:
 	# run this each time we make changes to the model
-	python manage.py schemamigration main --auto
+	python manage.py schemamigration main changes --auto
 
 migrate:
         # run this to apply changes to the model

lib/main/models/__init__.py

@@ -1,13 +1,8 @@
 from django.db import models
+from django.db.models import CASCADE, SET_NULL, PROTECT
 
-# TODO: jobs and events model
+# TODO: jobs and events model TBD
-# TODO: how to link up with Django user auth
+# TODO: reporting model TBD
-# TODO: general schema review/organization
-# TODO: audit cascade behavior and defaults
-# TODO: set related names
-
-SET_NULL = models.SET_NULL
-PROTECT  = models.PROTECT
 
 class CommonModel(models.Model):
     ''' 
@@ -22,11 +17,15 @@ class CommonModel(models.Model):
     creation_date = models.DateField()
     tags          = models.ManyToManyField('Tag', related_name='%(class)s_tags') 
     audit_trail   = models.ManyToManyField('AuditTrail', related_name='%(class)s_audit_trails')
+    active        = models.BooleanField(default=True)
  
 class Tag(models.Model):
     ''' 
     any type of object can be given a search tag 
     '''
+    
+    class Meta:
+        app_label = 'main'
 
     name = models.TextField()
  
@@ -35,18 +34,24 @@ class AuditTrail(CommonModel):
     ''' 
     changing any object records the change 
     '''
+    
+    class Meta:
+        app_label = 'main'
  
     resource_type = models.TextField()
-    modified_by   = models.ForeignKey('User')
+    modified_by   = models.ForeignKey('User', on_delete=SET_NULL, null=True)
     delta         = models.TextField() # FIXME: switch to JSONField
     detail        = models.TextField()
     comment       = models.TextField()
-    tag           = models.ForeignKey('Tag')
+    tag           = models.ForeignKey('Tag', on_delete=SET_NULL, null=True)
 
 class Organization(CommonModel):
     ''' 
     organizations are the basic unit of multi-tenancy divisions 
     '''    
+    
+    class Meta:
+        app_label = 'main'
 
     users    = models.ManyToManyField('User', related_name='organizations')
     admins   = models.ManyToManyField('User', related_name='admin_of_organizations')
@@ -56,23 +61,32 @@ class Inventory(CommonModel):
     ''' 
     an inventory source contains lists and hosts.
     '''
+    
+    class Meta:
+        app_label = 'main'
   
-    organization = models.ForeignKey(Organization, related_name='inventories')    
+    organization = models.ForeignKey(Organization, null=True, on_delete=SET_NULL, related_name='inventories')    
 
 class Host(CommonModel):
     '''
     A managed node
     '''
+    
+    class Meta:
+        app_label = 'main'
 
-    inventory = models.ForeignKey('Inventory', related_name='hosts')
+    inventory = models.ForeignKey('Inventory', null=True, on_delete=SET_NULL, related_name='hosts')
     
 
 class Group(CommonModel):
     '''
     A group of managed nodes.  May belong to multiple groups
     '''
+    
+    class Meta:
+        app_label = 'main'
 
-    inventory = models.ForeignKey('Inventory', related_name='groups')
+    inventory = models.ForeignKey('Inventory', null=True, on_delete=SET_NULL, related_name='groups')
     parents   = models.ManyToManyField('self', related_name='children') 
 
 # FIXME: audit nullables
@@ -82,15 +96,21 @@ class VariableData(CommonModel):
     '''
     A set of host or group variables
     '''  
+    
+    class Meta:
+        app_label = 'main'
 
-    host  = models.ForeignKey('Host', null=True, default=None, blank=True, related_name='variable_data')
+    host  = models.ForeignKey('Host', null=True, default=None, blank=True, on_delete=CASCADE, related_name='variable_data')
-    group = models.ForeignKey('Group', null=True, default=None, blank=True, related_name='variable_data')
+    group = models.ForeignKey('Group', null=True, default=None, blank=True, on_delete=CASCADE, related_name='variable_data')
     data  = models.TextField() # FIXME: JsonField
 
 class User(CommonModel):
     '''
     Basic user class
     '''
+    
+    class Meta:
+        app_label = 'main'
 
     # FIXME: how to integrate with Django auth?
 
@@ -102,10 +122,13 @@ class Credential(CommonModel):
     Usually this is a SSH key location, and possibly an unlock password.
     If used with sudo, a sudo password should be set if required.
     '''
+    
+    class Meta:
+        app_label = 'main'
 
-    user            = models.ForeignKey('User', null=True, default=None, blank=True, related_name='credentials')
+    user            = models.ForeignKey('User', null=True, default=None, blank=True, on_delete=SET_NULL, related_name='credentials')
-    project         = models.ForeignKey('Project', null=True, default=None, blank=True, related_name='credentials')
+    project         = models.ForeignKey('Project', null=True, default=None, blank=True, on_delete=SET_NULL, related_name='credentials')
-    team            = models.ForeignKey('Team', null=True, default=None, blank=True, related_name='credentials')
+    team            = models.ForeignKey('Team', null=True, default=None, blank=True, on_delete=SET_NULL, related_name='credentials')
 
     ssh_key_path    = models.TextField(blank=True, default='')
     ssh_key_data    = models.TextField(blank=True, default='') # later
@@ -119,6 +142,9 @@ class Team(CommonModel):
     A team is a group of users that work on common projects.
     '''
     
+    class Meta:
+        app_label = 'main'
+    
     projects        = models.ManyToManyField('Project', related_name='teams')
     users           = models.ManyToManyField('User', related_name='teams')
     organization    = models.ManyToManyField('Organization', related_name='teams')
@@ -127,6 +153,9 @@ class Project(CommonModel):
     '''  
     A project represents a playbook git repo that can access a set of inventories
     '''   
+    
+    class Meta:
+        app_label = 'main'
  
     inventories      = models.ManyToManyField('Inventory', related_name='projects')
     local_repository = models.TextField()
@@ -137,10 +166,13 @@ class Permission(CommonModel):
     '''
     A permission allows a user, project, or team to be able to use an inventory source.
     '''
+    
+    class Meta:
+        app_label = 'main'
 
-    user            = models.ForeignKey('User', related_name='permissions')
+    user            = models.ForeignKey('User', null=True, on_delete=SET_NULL, related_name='permissions')
-    project         = models.ForeignKey('Project', related_name='permissions')
+    project         = models.ForeignKey('Project', null=True, on_delete=SET_NULL, related_name='permissions')
-    team            = models.ForeignKey('Team', related_name='permissions')
+    team            = models.ForeignKey('Team', null=True, on_delete=SET_NULL, related_name='permissions')
     job_type        = models.TextField()
 
 # TODO: other job types (later)
@@ -149,11 +181,14 @@ class LaunchJob(CommonModel):
     ''' 
     a launch job is a request to apply a project to an inventory source with a given credential 
     '''
+    
+    class Meta:
+        app_label = 'main'
 
-    inventory      = models.ForeignKey('Inventory', null=True, default=None, blank=True, related_name='launch_jobs')
+    inventory      = models.ForeignKey('Inventory', on_delete=SET_NULL, null=True, default=None, blank=True, related_name='launch_jobs')
-    credential     = models.ForeignKey('Credential', null=True, default=None, blank=True, related_name='launch_jobs')
+    credential     = models.ForeignKey('Credential', on_delete=SET_NULL, null=True, default=None, blank=True, related_name='launch_jobs')
-    project        = models.ForeignKey('Project', null=True, default=None, blank=True, related_name='launch_jobs')
+    project        = models.ForeignKey('Project', on_delete=SET_NULL, null=True, default=None, blank=True, related_name='launch_jobs')
-    user           = models.ForeignKey('User', null=True, default=None, blank=True, related_name='launch_jobs')
+    user           = models.ForeignKey('User', on_delete=SET_NULL, null=True, default=None, blank=True, related_name='launch_jobs')
     job_type       = models.TextField()
     
  
@@ -161,8 +196,11 @@ class LaunchJob(CommonModel):
 # TODO: Events
 
 class LaunchJobStatus(CommonModel):
+    
+    class Meta:
+        app_label = 'main'
 
-    launch_job     = models.ForeignKey('LaunchJob', related_name='launch_job_statuses')
+    launch_job     = models.ForeignKey('LaunchJob', null=True, on_delete=SET_NULL, related_name='launch_job_statuses')
     status         = models.IntegerField()
     result_data    = models.TextField()