aboutsummaryrefslogtreecommitdiffstats
path: root/src/booking/quick_deployer.py
diff options
context:
space:
mode:
authorParker Berberian <pberberian@iol.unh.edu>2020-02-13 14:25:24 -0500
committerParker Berberian <pberberian@iol.unh.edu>2020-02-13 14:25:24 -0500
commit8c012f8a9bc64add11920688abcd6981278cb0ea (patch)
tree99772d9361784d2724d1665c566c69888ff7d5e9 /src/booking/quick_deployer.py
parentf5cdab1569b26df0c7ffc3df1529f095116fd13a (diff)
Fix Imports
Fixes stale import statements. The dashboard can now come up and we can run our unit tests Change-Id: I7189afb2cd37aaa2492de065c236b6aa9a35de5b Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
Diffstat (limited to 'src/booking/quick_deployer.py')
-rw-r--r--src/booking/quick_deployer.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/booking/quick_deployer.py b/src/booking/quick_deployer.py
index 94ad14d..917f578 100644
--- a/src/booking/quick_deployer.py
+++ b/src/booking/quick_deployer.py
@@ -12,7 +12,7 @@ import json
from django.db.models import Q
from datetime import timedelta
from django.utils import timezone
-from django.form import ValidationException
+from django.core.exceptions import ValidationError
from account.models import Lab
from resource_inventory.models import (
@@ -21,7 +21,7 @@ from resource_inventory.models import (
Image,
OPNFVRole,
OPNFVConfig,
- HostOPNFVConfig,
+ ResourceOPNFVConfig,
)
from resource_inventory.resource_manager import ResourceManager
from resource_inventory.pdf_templater import PDFTemplater
@@ -49,9 +49,9 @@ def parse_resource_field(resource_json):
template = ResourceTemplate.objects.get(pk=resource_info['id'])
if lab is None:
- raise ValidationException("No lab was selected")
+ raise ValidationError("No lab was selected")
if template is None:
- raise ValidationException("No Host was selected")
+ raise ValidationError("No Host was selected")
return lab, template
@@ -82,7 +82,7 @@ def generate_hostopnfv(hostconfig, opnfvconfig):
name="Jumphost",
description="Single server jumphost role"
)
- return HostOPNFVConfig.objects.create(
+ return ResourceOPNFVConfig.objects.create(
role=role,
host_config=hostconfig,
opnfv_config=opnfvconfig
@@ -107,15 +107,15 @@ def check_invariants(request, **kwargs):
if installer in image.os.sup_installers.all():
# if installer not here, we can omit that and not check for scenario
if not scenario:
- raise ValidationException("An OPNFV Installer needs a scenario to be chosen to work properly")
+ raise ValidationError("An OPNFV Installer needs a scenario to be chosen to work properly")
if scenario not in installer.sup_scenarios.all():
- raise ValidationException("The chosen installer does not support the chosen scenario")
+ raise ValidationError("The chosen installer does not support the chosen scenario")
if image.from_lab != lab:
- raise ValidationException("The chosen image is not available at the chosen hosting lab")
+ raise ValidationError("The chosen image is not available at the chosen hosting lab")
if image.host_type != host_profile:
- raise ValidationException("The chosen image is not available for the chosen host type")
+ raise ValidationError("The chosen image is not available for the chosen host type")
if not image.public and image.owner != request.user:
- raise ValidationException("You are not the owner of the chosen private image")
+ raise ValidationError("You are not the owner of the chosen private image")
if length < 1 or length > 21:
raise BookingLengthException("Booking must be between 1 and 21 days long")