From 104470ee008817df4a3b78d24e524e8c92eac9a0 Mon Sep 17 00:00:00 2001
From: Sawyer Bergeron <sbergeron@iol.unh.edu>
Date: Fri, 15 Oct 2021 17:03:58 -0400
Subject: WIP merge of master into cobbler

Squashed commit of the following:

commit 35b9f39178cc502a5283a1b37a65f7dd0838ae05
Author: Sawyer Bergeron <sbergeron@iol.unh.edu>
Date:   Fri Oct 15 14:14:46 2021 -0400

    Merge User Booking API Rev 1 (Try 3)

    Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
    Change-Id: Ie1eee0a59929f8da39f16bb6bc17ae3de4f1cba9
    Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>

commit b3ed8ebcf536c021330e7ccbc0376f6b89189348
Author: Jacob Hodgdon <jhodgdon@iol.unh.edu>
Date:   Tue Jul 20 09:55:04 2021 -0400

    Additional changes for rebrand

    Signed-off-by: Jacob Hodgdon <jhodgdon@iol.unh.edu>
    Change-Id: Ibd525f966b3ed3aebdbe688e5ee5daa4ea1cf294
    Signed-off-by: Jacob Hodgdon <jhodgdon@iol.unh.edu>
    Signed-off-by: Raven Hodgdon <jhodgdon@iol.unh.edu>

commit 17b6c7809771ac8bf3879add033d2169f671591a
Author: Jacob Hodgdon <jhodgdon@iol.unh.edu>
Date:   Fri May 14 15:42:56 2021 -0400

    Color fixes for rebrand

    Signed-off-by: Jacob Hodgdon <jhodgdon@iol.unh.edu>
    Change-Id: I5cf4ede598afa377db7ecec17d8dfef085e130ac

Change-Id: I55494d24bcef74def85236b09168508e428d368e
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
---
 src/api/urls.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'src/api/urls.py')

diff --git a/src/api/urls.py b/src/api/urls.py
index 8dcfafe..5ffcc51 100644
--- a/src/api/urls.py
+++ b/src/api/urls.py
@@ -53,6 +53,14 @@ from api.views import (
     all_opsyss,
     single_image,
     single_opsys,
+    user_bookings,
+    make_booking,
+    available_templates,
+    images_for_template,
+    specific_booking,
+    extend_booking,
+    all_users,
+    list_labs
 )
 
 urlpatterns = [
@@ -79,5 +87,17 @@ urlpatterns = [
     path('labs/<slug:lab_name>/jobs/getByType/DATA', analytics_job),
     path('labs/<slug:lab_name>/users', lab_users),
     path('labs/<slug:lab_name>/users/<int:user_id>', lab_user),
+
+    path('booking', user_bookings),
+    path('booking/<int:booking_id>', specific_booking),
+    path('booking/<int:booking_id>/extendBooking/<int:days>', extend_booking),
+    path('booking/makeBooking', make_booking),
+
+    path('resource_inventory/availableTemplates', available_templates),
+    path('resource_inventory/<int:template_id>/images', images_for_template),
+
+    path('users', all_users),
+    path('labs', list_labs),
+
     url(r'^token$', GenerateTokenView.as_view(), name='generate_token'),
 ]
-- 
cgit 1.2.3-korg