endoreg-db 0.3.5__tar.gz → 0.3.7__tar.gz

{endoreg_db-0.3.5 → endoreg_db-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: endoreg-db
-Version: 0.3.5
+Version: 0.3.7
 Summary: EndoReg Db Django App
 License: GNU3
 Author: Thomas J. Lux

{endoreg_db-0.3.5 → endoreg_db-0.3.7}/endoreg_db/data/__init__.py

@@ -52,6 +52,9 @@ CASE_TEMPLATE_RULE_TYPE_DATA_DIR = CASE_TEMPLATE_BASE_DIR / "rule_type"
 CASE_TEMPLATE_RULE_VALUE_DATA_DIR = CASE_TEMPLATE_BASE_DIR / "rule_value"
 CASE_TEMPLATE_RULE_VALUE_TYPE_DATA_DIR = CASE_TEMPLATE_BASE_DIR / "rule_value_type"
 
+# NETWORK
+NETWORK_DEVICE_DATA_DIR = DATA_DIR / "network_device"
+NETWORK_DEVICE_TYPE_DATA_DIR = DATA_DIR / "network_device_type"
 
 # To Do
 LAB_VALUE_DATA_DIR = DATA_DIR / "lab_value"

endoreg_db-0.3.7/endoreg_db/data/network_device/data.yaml

@@ -0,0 +1,17 @@
+- model: endoreg_db.network_device
+  fields:
+    name: "agl-server-01"
+    device_type: "agl-server"
+    ip_address: "172.16.255.1"
+
+- model: endoreg_db.network_device
+  fields:
+    name: "agl-server-03"
+    device_type: "agl-server"
+    ip_address: "172.16.255.3"
+
+- model: endoreg_db.network_device
+  fields:
+    name: "agl-server-04"
+    device_type: "agl-server"
+    ip_address: "172.16.255.4"

endoreg_db-0.3.7/endoreg_db/data/network_device_type/data.yaml

@@ -0,0 +1,8 @@
+- model: endoreg_db.network_device_type
+  fields:
+    name: "agl-server"
+
+
+- model: endoreg_db.network_device_type
+  fields:
+    name: "coloreg-client"

{endoreg_db-0.3.5 → endoreg_db-0.3.7}/endoreg_db/management/commands/load_base_db_data.py

@@ -16,6 +16,10 @@ class Command(BaseCommand):
 
         self.stdout.write(self.style.SUCCESS("Populating base db models with data..."))
 
+        # Run the load_network_data command
+        self.stdout.write(self.style.SUCCESS("Running load_network_data..."))
+        call_command('load_network_data', verbose=verbose)
+
         # Run the load_profession_data command
         self.stdout.write(self.style.SUCCESS("Running load_profession_data..."))
         call_command('load_profession_data', verbose=verbose)

endoreg_db-0.3.7/endoreg_db/management/commands/load_network_data.py

@@ -0,0 +1,49 @@
+from django.core.management.base import BaseCommand
+from endoreg_db.models import NetworkDevice, NetworkDeviceType
+from ...utils import load_model_data_from_yaml
+from ...data import NETWORK_DEVICE_DATA_DIR, NETWORK_DEVICE_TYPE_DATA_DIR
+
+MODEL_0 = NetworkDeviceType
+MODEL_1 = NetworkDevice
+
+IMPORT_MODELS = [ # string as model key, serves as key in IMPORT_METADATA
+    MODEL_0.__name__,
+    MODEL_1.__name__
+]
+
+IMPORT_METADATA = {
+    MODEL_0.__name__: {
+        "dir": NETWORK_DEVICE_TYPE_DATA_DIR, # e.g. "interventions"
+        "model": MODEL_0, # e.g. Intervention
+        "foreign_keys": [], # e.g. ["intervention_types"]
+        "foreign_key_models": [] # e.g. [InterventionType]
+    },
+    MODEL_1.__name__: {
+        "dir": NETWORK_DEVICE_DATA_DIR, # e.g. "interventions"
+        "model": MODEL_1, # e.g. Intervention
+        "foreign_keys": ["device_type"], # e.g. ["intervention_types"]
+        "foreign_key_models": [NetworkDeviceType] # e.g. [InterventionType]
+    }
+}
+
+class Command(BaseCommand):
+    help = """Load all .yaml files in the data/intervention directory
+    into the Intervention and InterventionType model"""
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            '--verbose',
+            action='store_true',
+            help='Display verbose output',
+        )
+
+    def handle(self, *args, **options):
+        verbose = options['verbose']
+        for model_name in IMPORT_MODELS:
+            _metadata = IMPORT_METADATA[model_name]
+            load_model_data_from_yaml(
+                self,
+                model_name,
+                _metadata,
+                verbose
+            )

{endoreg_db-0.3.5 → endoreg_db-0.3.7}/endoreg_db/models/__init__.py

@@ -4,6 +4,7 @@ from .center import *
 from .report_reader import ReportReaderConfig, ReportReaderFlag
 from .emission import *
 from .persons import *
+from .network import *
 
 from .case_template import *
 # from .other.distribution import (

endoreg_db-0.3.7/endoreg_db/models/network/__init__.py

@@ -0,0 +1,2 @@
+from .network_device import NetworkDevice
+from .network_device_type import NetworkDeviceType

endoreg_db-0.3.7/endoreg_db/models/network/network_device.py

@@ -0,0 +1,27 @@
+# Django db class to store network devices (e.g., servers, clients, switches, etc.)
+
+from django.db import models
+
+class NetworkDeviceManager(models.Manager):
+    # Custom manager for NetworkDevice; defines name as natural key
+    def get_by_natural_key(self, name):
+        return self.get(name=name)
+    
+class NetworkDevice(models.Model):
+    name = models.CharField(max_length=255)
+    ip = models.GenericIPAddressField(blank=True, null=True)
+    description = models.CharField(max_length=255)
+    device_type = models.ForeignKey("NetworkDeviceType", on_delete=models.CASCADE)
+    created = models.DateTimeField(auto_now_add=True)
+    updated = models.DateTimeField(auto_now=True)
+    objects = NetworkDeviceManager()
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        db_table = 'network_devices'
+        ordering = ['name']
+        
+    def natural_key(self):
+        return (self.name,)

endoreg_db-0.3.7/endoreg_db/models/network/network_device_type.py

@@ -0,0 +1,23 @@
+# Django db class to store network device types (e.g., server, client, switch, etc.)
+
+from django.db import models
+
+class NetworkDeviceTypeManager(models.Model):
+    # Custom manager for NetworkDeviceType; defines name as natural key
+    def get_by_natural_key(self, name):
+        return self.get(name=name)
+
+class NetworkDeviceType(models.Model):
+    name = models.CharField(max_length=255)
+    description = models.CharField(max_length=255)
+    created = models.DateTimeField(auto_now_add=True)
+    updated = models.DateTimeField(auto_now=True)
+    objects = NetworkDeviceTypeManager()
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        db_table = 'network_device_types'
+        ordering = ['name']
+

{endoreg_db-0.3.5 → endoreg_db-0.3.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "endoreg-db"
-version = "0.3.5"
+version = "0.3.7"
 description = "EndoReg Db Django App"
 authors = ["Thomas J. Lux"]
 license = "GNU3"