4 files changed, 79 insertions, 16 deletions
diff --git a/src/resource_inventory/admin.py b/src/resource_inventory/admin.py
index 439dad3..2444a98 100644
--- a/src/resource_inventory/admin.py
+++ b/src/resource_inventory/admin.py
@@ -10,6 +10,8 @@
 
 from django.contrib import admin
 
+from resource_inventory.forms import InterfaceConfigurationForm
+
 from resource_inventory.models import (
     ResourceProfile,
     InterfaceProfile,
@@ -32,9 +34,10 @@ from resource_inventory.models import (
     Image,
     RemoteInfo,
     PhysicalNetwork,
-    NetworkConnection
+    NetworkConnection,
 )
 
+
 admin.site.register([
     ResourceProfile,
     InterfaceProfile,
@@ -43,7 +46,6 @@ admin.site.register([
     RamProfile,
     ResourceTemplate,
     ResourceConfiguration,
-    InterfaceConfiguration,
     Server,
     Interface,
     Network,
@@ -57,4 +59,12 @@ admin.site.register([
     Image,
     PhysicalNetwork,
     NetworkConnection,
-    RemoteInfo])
+    RemoteInfo]
+)
+
+
+class InterfaceConfigurationAdmin(admin.ModelAdmin):
+    form = InterfaceConfigurationForm
+
+
+admin.site.register(InterfaceConfiguration, InterfaceConfigurationAdmin)
diff --git a/src/resource_inventory/forms.py b/src/resource_inventory/forms.py
new file mode 100644
index 0000000..fb8c102
--- /dev/null
+++ b/src/resource_inventory/forms.py
@@ -0,0 +1,31 @@
+##############################################################################
+# Copyright (c) 2020 Sawyer Bergeron, Sean Smith, and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+from django.core.exceptions import ValidationError
+from django import forms
+
+from resource_inventory.models import Network, InterfaceConfiguration
+
+
+class InterfaceConfigurationForm(forms.ModelForm):
+    class Meta:
+        model = InterfaceConfiguration
+        fields = ['profile', 'resource_config', 'connections']
+
+    def clean(self):
+        connections = self.cleaned_data.get('connections')
+        resource_config = self.cleaned_data.get('resource_config')
+
+        valid_nets = set(Network.objects.filter(bundle=resource_config.template))
+        curr_nets = set([conn.network for conn in connections])
+
+        if not curr_nets.issubset(valid_nets):
+            raise ValidationError("Cannot have network connection to network outside pod")
+
+        return self.cleaned_data
diff --git a/src/resource_inventory/models.py b/src/resource_inventory/models.py
index d1b7a75..557a4fc 100644
--- a/src/resource_inventory/models.py
+++ b/src/resource_inventory/models.py
@@ -1,5 +1,6 @@
 ##############################################################################
 # Copyright (c) 2018 Sawyer Bergeron, Parker Berberian, and others.
+# Copyright (c) 2020 Sawyer Bergeron, Sean Smith, others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
@@ -162,7 +163,7 @@ class ResourceTemplate(models.Model):
     description = models.CharField(max_length=1000, default="")
     public = models.BooleanField(default=False)
     temporary = models.BooleanField(default=False)
-    copy_of = models.ForeignKey("ResourceTemplate", null=True, on_delete=models.SET_NULL)
+    copy_of = models.ForeignKey("ResourceTemplate", blank=True, null=True, on_delete=models.SET_NULL)
 
     def getConfigs(self):
         configs = self.resourceConfigurations.all()
@@ -212,7 +213,7 @@ class ResourceConfiguration(models.Model):
     name = models.CharField(max_length=3000, default="<Hostname>")
 
     def __str__(self):
-        return "config with " + str(self.template) + " and image " + str(self.image)
+        return str(self.name)
 
 
 def get_default_remote_info():
@@ -238,9 +239,9 @@ class Resource(models.Model):
     class Meta:
         abstract = True
 
-    bundle = models.ForeignKey(ResourceBundle, on_delete=models.SET_NULL, null=True)
+    bundle = models.ForeignKey(ResourceBundle, on_delete=models.SET_NULL, blank=True, null=True)
     profile = models.ForeignKey(ResourceProfile, on_delete=models.CASCADE)
-    config = models.ForeignKey(ResourceConfiguration, on_delete=models.SET_NULL, null=True)
+    config = models.ForeignKey(ResourceConfiguration, on_delete=models.SET_NULL, blank=True, null=True)
     working = models.BooleanField(default=True)
     vendor = models.CharField(max_length=100, default="unknown")
     model = models.CharField(max_length=150, default="unknown")
@@ -413,11 +414,17 @@ class PhysicalNetwork(models.Model):
         # vlan_manager = self.bundle.lab.vlan_manager
         return False
 
+    def __str__(self):
+        return 'Physical Network for ' + self.generic_network.name
+
 
 class NetworkConnection(models.Model):
     network = models.ForeignKey(Network, on_delete=models.CASCADE)
     vlan_is_tagged = models.BooleanField()
 
+    def __str__(self):
+        return 'Connection to ' + self.network.name
+
 
 class Vlan(models.Model):
     id = models.AutoField(primary_key=True)
@@ -434,7 +441,7 @@ class InterfaceConfiguration(models.Model):
     id = models.AutoField(primary_key=True)
     profile = models.ForeignKey(InterfaceProfile, on_delete=models.CASCADE)
     resource_config = models.ForeignKey(ResourceConfiguration, on_delete=models.CASCADE, related_name='interface_configs')
-    connections = models.ManyToManyField(NetworkConnection)
+    connections = models.ManyToManyField(NetworkConnection, blank=True)
 
     def __str__(self):
         return "type " + str(self.profile) + " on host " + str(self.resource_config)
@@ -504,12 +511,21 @@ class Interface(models.Model):
     mac_address = models.CharField(max_length=17)
     bus_address = models.CharField(max_length=50)
     config = models.ManyToManyField(Vlan)
-    acts_as = models.OneToOneField(InterfaceConfiguration, null=True, on_delete=models.SET_NULL)
+    acts_as = models.OneToOneField(InterfaceConfiguration, blank=True, null=True, on_delete=models.CASCADE)
     profile = models.ForeignKey(InterfaceProfile, on_delete=models.CASCADE)
 
     def __str__(self):
         return self.mac_address + " on host " + str(self.profile.host.name)
 
+    def clean(self, *args, **kwargs):
+        if self.acts_as and self.acts_as.profile != self.profile:
+            raise ValidationError("Interface Configuration's Interface Profile does not match Interface Profile chosen for Interface.")
+        super().clean(*args, **kwargs)
+
+    def save(self, *args, **kwargs):
+        self.full_clean()
+        super().save(*args, **kwargs)
+
 
 """
 Some Enums for dealing with global constants.
diff --git a/src/resource_inventory/resource_manager.py b/src/resource_inventory/resource_manager.py
index 4d539bd..9300040 100644
--- a/src/resource_inventory/resource_manager.py
+++ b/src/resource_inventory/resource_manager.py
@@ -82,7 +82,7 @@ class ResourceManager:
                 networks[network.name] = vlan
         return networks
 
-    def instantiateTemplate(self, resource_template, config=None):
+    def instantiateTemplate(self, resource_template):
         """
         Convert a ResourceTemplate into a ResourceBundle.
 
@@ -114,14 +114,16 @@ class ResourceManager:
     def configureNetworking(self, resource, vlan_map):
         for physical_interface in resource.interfaces.all():
             # assign interface configs
-            iface_configs = InterfaceConfiguration.objects.filter(profile=physical_interface.profile, resource_config=resource.config)
-            if iface_configs.count() != 1:
-                continue
+
+            iface_configs = InterfaceConfiguration.objects.filter(
+                profile=physical_interface.profile,
+                resource_config=resource.config
+            )
+
             iface_config = iface_configs.first()
             physical_interface.acts_as = iface_config
             physical_interface.acts_as.save()
-            #if not iface_config:
-            #    continue
+
             physical_interface.config.clear()
             for connection in iface_config.connections.all():
                 physicalNetwork = PhysicalNetwork.objects.create(
@@ -139,7 +141,11 @@ class ResourceManager:
 
     # private interface
     def acquireHost(self, resource_config):
-        resources = resource_config.profile.get_resources(lab=resource_config.template.lab, unreserved=True)
+        resources = resource_config.profile.get_resources(
+            lab=resource_config.template.lab,
+            unreserved=True
+        )
+
         try:
             resource = resources[0]  # TODO: should we randomize and 'load balance' the servers?
             resource.config = resource_config