From 530271c247a4ce538e3aa69fd3893481fada44ab Mon Sep 17 00:00:00 2001 From: Sawyer Bergeron Date: Fri, 15 May 2020 14:58:37 -0400 Subject: Merge resource branch This pulls master up to date to include changes to models and surrounding infra that allow for multi-node templates and merging of pods Squashed commit of the following: commit abc8f27d9c6b05fb3afcb9b00dc35c0f2232d1a6 Author: Sawyer Bergeron Date: Thu Apr 2 14:05:26 2020 -0400 Start fixing workflow for model changes Change-Id: I79df975ef45abf2e6e69594d358bbd205938828f Signed-off-by: Sawyer Bergeron Signed-off-by: Sawyer Bergeron commit 7a7e2182acd0ea94e19aba4926c3a12771b30a6d Author: sms1097 Date: Tue Mar 31 15:13:06 2020 -0400 Working on workflow refactoring Change-Id: I4141b6aca98aff7bff9cb78a7d5594e25eb45e98 Signed-off-by: Sean Smith commit c09050ae2814f07af58557b40f9ed3559063d2c7 Merge: 71438d9 b5ccdc4 Author: Parker Berberian Date: Tue Mar 24 20:34:16 2020 +0000 Merge "Able to delete configurations and view lab details" into resource commit b5ccdc4ffbb883c20f2f6f69aeef5002aef5db53 Author: sms1097 Date: Thu Mar 19 17:08:12 2020 -0400 Able to delete configurations and view lab details Change-Id: Ib15c86d84f4cc7e7745551889ce91c89b5de46e2 Signed-off-by: Sean Smith Change-Id: Id6748c6bea67773a861921394d88579730246598 commit 71438d9a35cdb316cece865c9d410aeffb0053d8 Merge: 5460d0d a758223 Author: Parker Berberian Date: Thu Mar 19 18:51:09 2020 +0000 Merge "Add / Fix tests for refactor" into resource commit 5460d0d447b075433a763f9bfa33448b88ec8393 Merge: a9063a3 f55d839 Author: Parker Berberian Date: Wed Mar 18 15:59:37 2020 +0000 Merge "Fixed the quick booking form resource template filtering. Added some more models to the admin page." into resource commit f55d839a029ab1f5ab1273872e71a97fa1d5108b Author: Adam Hassick Date: Tue Mar 17 11:35:40 2020 -0400 Fixed the quick booking form resource template filtering. Added some more models to the admin page. Signed-off-by: Adam Hassick Change-Id: I2d2e7aeb96b10c231804a62f37a476039c954b7b commit a9063a347c4ebef0e53a17f198468bb135772810 Author: Parker Berberian Date: Wed Mar 18 10:29:51 2020 -0400 Fixes Some Issues with Quick Booking Seen in the Akraino lab Signed-off-by: Parker Berberian Change-Id: I2a1e843fbaa7984225f2f80742dad59dc348fbf2 commit a758223f44c6fec595b055d7c9b232b00e9174a0 Author: Parker Berberian Date: Tue Mar 17 11:07:32 2020 -0400 Add / Fix tests for refactor Change-Id: I0526d1942f87707082a4eb1c8c98910f84481c23 Signed-off-by: Parker Berberian Author: Parker Berberian Add "Pod" Column to booking list Signed-off-by: Parker Berberian Change-Id: I270913283bf1e5815cadf622ba2fd5f98bb61675 Author: Parker Berberian Fixes that make the Akraino dashboard work Signed-off-by: Parker Berberian Change-Id: I81746473a4511ef7d46445a7b16809a6e9da100f Signed-off-by: Sawyer Bergeron Change-Id: I4b428e7c8a8d401d7bae95cba01077feb0332a7f Signed-off-by: Sawyer Bergeron --- src/booking/tests/test_models.py | 48 +++++----------------------------------- 1 file changed, 5 insertions(+), 43 deletions(-) (limited to 'src/booking/tests/test_models.py') diff --git a/src/booking/tests/test_models.py b/src/booking/tests/test_models.py index c8c8ea8..37eb655 100644 --- a/src/booking/tests/test_models.py +++ b/src/booking/tests/test_models.py @@ -11,13 +11,12 @@ from datetime import timedelta -from django.contrib.auth.models import Permission, User +from django.contrib.auth.models import User from django.test import TestCase from django.utils import timezone -# from booking.models import * from booking.models import Booking -from resource_inventory.models import ResourceBundle, GenericResourceBundle, ConfigBundle +from dashboard.testing_utils import make_resource_template, make_user class BookingModelTestCase(TestCase): @@ -27,8 +26,6 @@ class BookingModelTestCase(TestCase): Creates all the scafolding needed and tests the Booking model """ - count = 0 - def setUp(self): """ Prepare for Booking model tests. @@ -36,29 +33,9 @@ class BookingModelTestCase(TestCase): Creates all the needed models, such as users, resources, and configurations """ self.owner = User.objects.create(username='owner') - - self.res1 = ResourceBundle.objects.create( - template=GenericResourceBundle.objects.create( - name="gbundle" + str(self.count) - ) - ) - self.count += 1 - self.res2 = ResourceBundle.objects.create( - template=GenericResourceBundle.objects.create( - name="gbundle2" + str(self.count) - ) - ) - self.count += 1 - self.user1 = User.objects.create(username='user1') - - self.add_booking_perm = Permission.objects.get(codename='add_booking') - self.user1.user_permissions.add(self.add_booking_perm) - - self.user1 = User.objects.get(pk=self.user1.id) - self.config_bundle = ConfigBundle.objects.create( - owner=self.user1, - name="test config" - ) + self.res1 = make_resource_template(name="Test template 1") + self.res2 = make_resource_template(name="Test template 2") + self.user1 = make_user(username='user1') def test_start_end(self): """ @@ -76,7 +53,6 @@ class BookingModelTestCase(TestCase): end=end, resource=self.res1, owner=self.user1, - config_bundle=self.config_bundle ) end = start self.assertRaises( @@ -86,7 +62,6 @@ class BookingModelTestCase(TestCase): end=end, resource=self.res1, owner=self.user1, - config_bundle=self.config_bundle ) def test_conflicts(self): @@ -105,7 +80,6 @@ class BookingModelTestCase(TestCase): end=end, owner=self.user1, resource=self.res1, - config_bundle=self.config_bundle ) ) @@ -116,7 +90,6 @@ class BookingModelTestCase(TestCase): end=end, resource=self.res1, owner=self.user1, - config_bundle=self.config_bundle ) self.assertRaises( @@ -126,7 +99,6 @@ class BookingModelTestCase(TestCase): end=end - timedelta(days=1), resource=self.res1, owner=self.user1, - config_bundle=self.config_bundle ) self.assertRaises( @@ -136,7 +108,6 @@ class BookingModelTestCase(TestCase): end=end, resource=self.res1, owner=self.user1, - config_bundle=self.config_bundle ) self.assertRaises( @@ -146,7 +117,6 @@ class BookingModelTestCase(TestCase): end=end - timedelta(days=1), resource=self.res1, owner=self.user1, - config_bundle=self.config_bundle ) self.assertRaises( @@ -156,7 +126,6 @@ class BookingModelTestCase(TestCase): end=end + timedelta(days=1), resource=self.res1, owner=self.user1, - config_bundle=self.config_bundle ) self.assertRaises( @@ -166,7 +135,6 @@ class BookingModelTestCase(TestCase): end=end + timedelta(days=1), resource=self.res1, owner=self.user1, - config_bundle=self.config_bundle ) self.assertTrue( @@ -175,7 +143,6 @@ class BookingModelTestCase(TestCase): end=start, owner=self.user1, resource=self.res1, - config_bundle=self.config_bundle ) ) @@ -185,7 +152,6 @@ class BookingModelTestCase(TestCase): end=end + timedelta(days=1), owner=self.user1, resource=self.res1, - config_bundle=self.config_bundle ) ) @@ -195,7 +161,6 @@ class BookingModelTestCase(TestCase): end=start - timedelta(days=1), owner=self.user1, resource=self.res1, - config_bundle=self.config_bundle ) ) @@ -205,7 +170,6 @@ class BookingModelTestCase(TestCase): end=end + timedelta(days=2), owner=self.user1, resource=self.res1, - config_bundle=self.config_bundle ) ) @@ -215,7 +179,6 @@ class BookingModelTestCase(TestCase): end=end, owner=self.user1, resource=self.res2, - config_bundle=self.config_bundle ) ) @@ -234,7 +197,6 @@ class BookingModelTestCase(TestCase): end=end, owner=self.user1, resource=self.res1, - config_bundle=self.config_bundle ) ) -- cgit 1.2.3-korg