aboutsummaryrefslogtreecommitdiffstats
path: root/src/api/models.py
diff options
context:
space:
mode:
authorParker Berberian <pberberian@iol.unh.edu>2020-04-14 18:15:55 +0000
committerGerrit Code Review <gerrit@opnfv.org>2020-04-14 18:15:55 +0000
commit6bf37e9864787e0398a1d2e1cdd10b40a8ebc6e6 (patch)
tree18396967cc32110ae5455827e612e2846e55392c /src/api/models.py
parentd5b4f4c77534824430fd8e2d3f15e5f7ed6303f5 (diff)
parent557659acfd97ddaacdb89192ff6a575691b39093 (diff)
Merge "Add user + user list to API"
Diffstat (limited to 'src/api/models.py')
-rw-r--r--src/api/models.py44
1 files changed, 35 insertions, 9 deletions
diff --git a/src/api/models.py b/src/api/models.py
index de73a7a..e41a44d 100644
--- a/src/api/models.py
+++ b/src/api/models.py
@@ -33,7 +33,7 @@ from resource_inventory.models import (
)
from resource_inventory.idf_templater import IDFTemplater
from resource_inventory.pdf_templater import PDFTemplater
-from account.models import Downtime
+from account.models import Downtime, UserProfile
from dashboard.utils import AbstractModelQuery
@@ -174,6 +174,26 @@ class LabManager(object):
for profile in ResourceProfile.objects.filter(labs=self.lab)]
return prof
+ def format_user(self, userprofile):
+ return {
+ "id": userprofile.user.id,
+ "username": userprofile.user.username,
+ "email": userprofile.email_addr,
+ "first_name": userprofile.user.first_name,
+ "last_name": userprofile.user.last_name,
+ "company": userprofile.company
+ }
+
+ def get_users(self):
+ userlist = [self.format_user(profile) for profile in UserProfile.objects.select_related("user").all()]
+
+ return json.dumps({"users": userlist})
+
+ def get_user(self, user_id):
+ profile = get_object_or_404(UserProfile, pk=user_id)
+
+ return json.dumps(self.format_user(profile))
+
def get_inventory(self):
inventory = {}
resources = ResourceQuery.filter(lab=self.lab)
@@ -331,7 +351,7 @@ class Job(models.Model):
return {"id": self.id, "payload": d}
def get_tasklist(self, status="all"):
- if status == "all":
+ if status != "all":
return JobTaskQuery.filter(job=self, status=status)
return JobTaskQuery.filter(job=self)
@@ -408,7 +428,7 @@ class BridgeConfig(models.Model):
def to_dict(self):
d = {}
- hid = self.interfaces.first().host.labid
+ hid = ResourceQuery.get(interface__pk=self.interfaces.first().pk).labid
d[hid] = {}
for interface in self.interfaces.all():
d[hid][interface.mac_address] = []
@@ -611,7 +631,7 @@ class HardwareConfig(TaskConfig):
def get_delta(self):
return self.format_delta(
- self.hosthardwarerelation.host.get_configuration(self.state),
+ self.hosthardwarerelation.get_resource().get_configuration(self.state),
self.hosthardwarerelation.lab_token)
@@ -623,7 +643,7 @@ class NetworkConfig(TaskConfig):
def to_dict(self):
d = {}
- hid = self.hostnetworkrelation.host.labid
+ hid = self.hostnetworkrelation.resource_id
d[hid] = {}
for interface in self.interfaces.all():
d[hid][interface.mac_address] = []
@@ -652,7 +672,7 @@ class NetworkConfig(TaskConfig):
def add_interface(self, interface):
self.interfaces.add(interface)
d = json.loads(self.delta)
- hid = self.hostnetworkrelation.host.labid
+ hid = self.hostnetworkrelation.resource_id
if hid not in d:
d[hid] = {}
d[hid][interface.mac_address] = []
@@ -809,6 +829,9 @@ class HostHardwareRelation(TaskRelation):
raise ValidationError("resource_id " + str(self.resource_id) + " does not refer to a single resource")
super().save(*args, **kwargs)
+ def get_resource(self):
+ return ResourceQuery.get(labid=self.resource_id)
+
class HostNetworkRelation(TaskRelation):
resource_id = models.CharField(max_length=200, default="default_id")
@@ -827,6 +850,9 @@ class HostNetworkRelation(TaskRelation):
raise ValidationError("resource_id " + str(self.resource_id) + " does not refer to a single resource")
super().save(*args, **kwargs)
+ def get_resource(self):
+ return ResourceQuery.get(labid=self.resource_id)
+
class SnapshotRelation(TaskRelation):
snapshot = models.ForeignKey(Image, on_delete=models.CASCADE)
@@ -941,7 +967,7 @@ class JobFactory(object):
for res in resources:
hardware_config = None
try:
- hardware_config = HardwareConfig.objects.get(relation__host=res)
+ hardware_config = HardwareConfig.objects.get(relation__resource_id=res.labid)
except Exception:
hardware_config = HardwareConfig()
@@ -1011,7 +1037,7 @@ class JobFactory(object):
@classmethod
def make_bridge_config(cls, booking):
- if booking.resource.hosts.count() < 2:
+ if len(booking.resource.get_resources()) < 2:
return None
try:
jumphost_config = ResourceOPNFVConfig.objects.filter(
@@ -1049,7 +1075,7 @@ class JobFactory(object):
opnfv_api_config.set_xdf(booking, False)
opnfv_api_config.save()
- for host in booking.resource.hosts.all():
+ for host in booking.resource.get_resources():
opnfv_api_config.roles.add(host)
software_config = SoftwareConfig.objects.create(opnfv=opnfv_api_config)
software_relation = SoftwareRelation.objects.create(job=job, config=software_config)