aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/resource_inventory/models.py24
-rw-r--r--src/resource_inventory/resource_manager.py20
-rw-r--r--src/workflow/booking_workflow.py38
-rw-r--r--src/workflow/models.py18
-rw-r--r--src/workflow/workflow_factory.py3
5 files changed, 32 insertions, 71 deletions
diff --git a/src/resource_inventory/models.py b/src/resource_inventory/models.py
index 33d98a0..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,14 +441,11 @@ 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)
- def save(self, *args, **kwargs):
- super().save(*args, **kwargs)
-
"""
OPNFV / Software configuration models
@@ -507,14 +511,14 @@ 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.CASCADE)
+ 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.profile != self.profile:
+ 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)
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
diff --git a/src/workflow/booking_workflow.py b/src/workflow/booking_workflow.py
index 128f179..ef89804 100644
--- a/src/workflow/booking_workflow.py
+++ b/src/workflow/booking_workflow.py
@@ -1,5 +1,6 @@
##############################################################################
# Copyright (c) 2018 Sawyer Bergeron, Parker Berberian, and others.
+# 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
@@ -13,7 +14,7 @@ from datetime import timedelta
from booking.models import Booking
from workflow.models import WorkflowStep, AbstractSelectOrCreate
-from workflow.forms import ResourceSelectorForm, SWConfigSelectorForm, BookingMetaForm, OPNFVSelectForm
+from workflow.forms import ResourceSelectorForm, BookingMetaForm, OPNFVSelectForm
from resource_inventory.models import OPNFVConfig, ResourceTemplate
from django.db.models import Q
@@ -65,41 +66,6 @@ class Booking_Resource_Select(Abstract_Resource_Select):
workflow_type = "booking"
-class SWConfig_Select(AbstractSelectOrCreate):
- title = "Select Software Configuration"
- description = "Choose the software and related configurations you want to have used for your deployment"
- short_title = "pod config"
- form = SWConfigSelectorForm
-
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
- self.select_repo_key = self.repo.SELECTED_CONFIG_BUNDLE
- self.confirm_key = "booking"
-
- def alert_bundle_missing(self):
- self.set_invalid("Please select a valid pod config")
-
- def get_form_queryset(self):
- user = self.repo_get(self.repo.SESSION_USER)
- grb = self.repo_get(self.repo.SELECTED_RESOURCE_TEMPLATE)
- qs = ResourceTemplate.objects.filter(Q(hidden=False) & (Q(owner=user) | Q(public=True))).filter(bundle=grb)
- return qs
-
- def put_confirm_info(self, bundle):
- confirm_dict = self.repo_get(self.repo.CONFIRMATION)
- if self.confirm_key not in confirm_dict:
- confirm_dict[self.confirm_key] = {}
- confirm_dict[self.confirm_key]["Software Configuration"] = bundle.name
- self.repo_put(self.repo.CONFIRMATION, confirm_dict)
-
- def get_page_context(self):
- return {
- 'select_type': 'swconfig',
- 'select_type_title': 'Software Config',
- 'addable_type_num': 2
- }
-
-
class OPNFV_EnablePicker(object):
pass
diff --git a/src/workflow/models.py b/src/workflow/models.py
index 173fdba..4a5616e 100644
--- a/src/workflow/models.py
+++ b/src/workflow/models.py
@@ -368,7 +368,6 @@ class Repository():
RESOURCE_SELECT = "resource_select"
CONFIRMATION = "confirmation"
SELECTED_RESOURCE_TEMPLATE = "selected resource template pk"
- SELECTED_CONFIG_BUNDLE = "selected config bundle pk"
SELECTED_OPNFV_CONFIG = "selected opnfv deployment config"
RESOURCE_TEMPLATE_MODELS = "generic_resource_template_models"
RESOURCE_TEMPLATE_INFO = "generic_resource_template_info"
@@ -456,15 +455,6 @@ class Repository():
self.el[self.RESULT_KEY] = self.SELECTED_RESOURCE_TEMPLATE
return
- if self.CONFIG_MODELS in self.el:
- errors = self.make_software_config_bundle()
- if errors:
- return errors
- else:
- self.el[self.HAS_RESULT] = True
- self.el[self.RESULT_KEY] = self.SELECTED_CONFIG_BUNDLE
- return
-
if self.OPNFV_MODELS in self.el:
errors = self.make_opnfv_config()
if errors:
@@ -585,11 +575,6 @@ class Repository():
else:
return "BOOK, no selected resource. CODE:0x000e"
- if self.SELECTED_CONFIG_BUNDLE not in self.el:
- return "BOOK, no selected config bundle. CODE:0x001f"
-
- booking.config_bundle = self.el[self.SELECTED_CONFIG_BUNDLE]
-
if not booking.start:
return "BOOK, booking has no start. CODE:0x0010"
if not booking.end:
@@ -602,7 +587,8 @@ class Repository():
else:
return "BOOK, collaborators not defined. CODE:0x0013"
try:
- resource_bundle = ResourceManager.getInstance().convertResourceBundle(selected_grb, config=booking.config_bundle)
+ res_manager = ResourceManager.getInstance()
+ resource_bundle = res_manager.instantiateTemplate(selected_grb)
except ResourceAvailabilityException as e:
return "BOOK, requested resources are not available. Exception: " + str(e) + " CODE:0x0014"
except ModelValidationException as e:
diff --git a/src/workflow/workflow_factory.py b/src/workflow/workflow_factory.py
index 04ed280..e688510 100644
--- a/src/workflow/workflow_factory.py
+++ b/src/workflow/workflow_factory.py
@@ -8,7 +8,7 @@
##############################################################################
-from workflow.booking_workflow import Booking_Resource_Select, SWConfig_Select, Booking_Meta, OPNFV_Select
+from workflow.booking_workflow import Booking_Resource_Select, Booking_Meta, OPNFV_Select
from workflow.resource_bundle_workflow import Define_Hardware, Define_Nets, Resource_Meta_Info, Define_Software
from workflow.snapshot_workflow import Select_Host_Step, Image_Meta_Step
from workflow.opnfv_workflow import Pick_Installer, Assign_Network_Roles, Assign_Host_Roles, OPNFV_Resource_Select, MetaInfo
@@ -73,7 +73,6 @@ class Workflow(object):
class WorkflowFactory():
booking_steps = [
Booking_Resource_Select,
- SWConfig_Select,
Booking_Meta,
OPNFV_Select,
]