From f5cdab1569b26df0c7ffc3df1529f095116fd13a Mon Sep 17 00:00:00 2001
From: Parker Berberian <pberberian@iol.unh.edu>
Date: Thu, 6 Feb 2020 12:59:51 -0500
Subject: Modifies Resource Models for ongoing refactor

Change-Id: Ice88f53135f57aca8e2de4d69274e7d490f981a4
Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
---
 src/workflow/forms.py  | 37 +++++++++++++++++--------------------
 src/workflow/models.py |  4 ++--
 2 files changed, 19 insertions(+), 22 deletions(-)

(limited to 'src/workflow')

diff --git a/src/workflow/forms.py b/src/workflow/forms.py
index f7a20eb..37bc390 100644
--- a/src/workflow/forms.py
+++ b/src/workflow/forms.py
@@ -300,7 +300,7 @@ class FormUtils:
         else:
             multiple_hosts = false
         labs = {}
-        hosts = {}
+        resources = {}
         items = {}
         neighbors = {}
         for lab in Lab.objects.all():
@@ -311,24 +311,21 @@ class FormUtils:
                 'description': lab.description,
                 'selected': false,
                 'selectable': true,
-                'follow': false,
+                'follow': multiple_hosts,
                 'multiple': false,
                 'class': 'lab'
             }
-            if multiple_hosts:
-                # "follow" this lab node to discover more hosts if allowed
-                lab_node['follow'] = true
             items[lab_node['id']] = lab_node
             neighbors[lab_node['id']] = []
             labs[lab_node['id']] = lab_node
 
-            for host in lab.hostprofiles.all():
-                host_node = {
+            for template in lab.resourcetemplates.all():
+                resource_node = {
                     'form': {"name": "host_name", "type": "text", "placeholder": "hostname"},
-                    'id': "host_" + str(host.id),
-                    'model_id': host.id,
-                    'name': host.name,
-                    'description': host.description,
+                    'id': "resource_" + str(template.id),
+                    'model_id': template.id,
+                    'name': template.name,
+                    'description': template.description,
                     'selected': false,
                     'selectable': true,
                     'follow': false,
@@ -336,15 +333,15 @@ class FormUtils:
                     'class': 'host'
                 }
                 if multiple_hosts:
-                    host_node['values'] = []  # place to store multiple values
-                items[host_node['id']] = host_node
-                neighbors[lab_node['id']].append(host_node['id'])
-                if host_node['id'] not in neighbors:
-                    neighbors[host_node['id']] = []
-                neighbors[host_node['id']].append(lab_node['id'])
-                hosts[host_node['id']] = host_node
-
-        display_objects = [("lab", labs.values()), ("host", hosts.values())]
+                    resource_node['values'] = []  # place to store multiple values
+                items[resource_node['id']] = resource_node
+                neighbors[lab_node['id']].append(resource_node['id'])
+                if resource_node['id'] not in neighbors:
+                    neighbors[resource_node['id']] = []
+                neighbors[resource_node['id']].append(lab_node['id'])
+                resources[resource_node['id']] = resource_node
+
+        display_objects = [("lab", labs.values()), ("resource", resources.values())]
 
         context = {
             'display_objects': display_objects,
diff --git a/src/workflow/models.py b/src/workflow/models.py
index 32ac39c..4d32869 100644
--- a/src/workflow/models.py
+++ b/src/workflow/models.py
@@ -18,7 +18,7 @@ import requests
 from workflow.forms import ConfirmationForm
 from api.models import JobFactory
 from dashboard.exceptions import ResourceAvailabilityException, ModelValidationException
-from resource_inventory.models import Image, GenericInterface, OPNFVConfig, HostOPNFVConfig, NetworkRole
+from resource_inventory.models import Image, InterfaceProfile, OPNFVConfig, ResourceOPNFVConfig, NetworkRole
 from resource_inventory.resource_manager import ResourceManager
 from resource_inventory.pdf_templater import PDFTemplater
 from notifier.manager import NotificationHandler
@@ -552,7 +552,7 @@ class Repository():
             if 'connections' in models:
                 for resource_name, mapping in models['connections'].items():
                     for profile_name, connection_set in mapping.items():
-                        interface = GenericInterface.objects.get(
+                        interface = InterfaceConfiguration.objects.get(
                             profile__name=profile_name,
                             host__resource__name=resource_name,
                             host__resource__bundle=models['bundle']
-- 
cgit 1.2.3-korg