Lab as a Service 2.0

See changes here:
https://wiki.opnfv.org/display/INF/Pharos+Laas

Change-Id: I59ada5f98e70a28d7f8c14eab3239597e236ca26
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>

3 files changed, 174 insertions, 150 deletions

diff --git a/src/booking/tests/__init__.py b/src/booking/tests/__init__.py
index b5914ce..b6fef6c 100644
--- a/src/booking/tests/__init__.py
+++ b/src/booking/tests/__init__.py
@@ -6,5 +6,3 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-
-
diff --git a/src/booking/tests/test_models.py b/src/booking/tests/test_models.py
index b4cd113..a83f817 100644
--- a/src/booking/tests/test_models.py
+++ b/src/booking/tests/test_models.py
@@ -1,5 +1,6 @@
 ##############################################################################
 # Copyright (c) 2016 Max Breitenfeldt and others.
+# Copyright (c) 2018 Parker Berberian, Sawyer Bergeron, and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
@@ -15,29 +16,28 @@ from django.test import TestCase
 from django.utils import timezone
 
 from booking.models import *
-from dashboard.models import Resource
-from jenkins.models import JenkinsSlave
-
+from resource_inventory.models import ResourceBundle, GenericResourceBundle, ConfigBundle
 
 class BookingModelTestCase(TestCase):
+    count = 0
     def setUp(self):
-        self.slave = JenkinsSlave.objects.create(name='test', url='test')
         self.owner = User.objects.create(username='owner')
 
-        self.res1 = Resource.objects.create(name='res1', slave=self.slave, description='x',
-                                            url='x',owner=self.owner)
-        self.res2 = Resource.objects.create(name='res2', slave=self.slave, description='x',
-                                            url='x',owner=self.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.installer = Installer.objects.create(name='TestInstaller')
-        self.scenario = Scenario.objects.create(name='TestScenario')
+        self.config_bundle = ConfigBundle.objects.create(owner=self.user1, name="test config")
 
     def test_start_end(self):
         """
@@ -46,11 +46,25 @@ class BookingModelTestCase(TestCase):
         """
         start = timezone.now()
         end = start - timedelta(weeks=1)
-        self.assertRaises(ValueError, Booking.objects.create, start=start, end=end,
-                          resource=self.res1, user=self.user1)
+        self.assertRaises(
+            ValueError,
+            Booking.objects.create,
+            start=start,
+            end=end,
+            resource=self.res1,
+            owner=self.user1,
+            config_bundle=self.config_bundle
+            )
         end = start
-        self.assertRaises(ValueError, Booking.objects.create, start=start, end=end,
-                          resource=self.res1, user=self.user1)
+        self.assertRaises(
+            ValueError,
+            Booking.objects.create,
+            start=start,
+            end=end,
+            resource=self.res1,
+            owner=self.user1,
+            config_bundle=self.config_bundle
+            )
 
     def test_conflicts(self):
         """
@@ -60,35 +74,153 @@ class BookingModelTestCase(TestCase):
         start = timezone.now()
         end = start + timedelta(weeks=1)
         self.assertTrue(
-            Booking.objects.create(start=start, end=end, user=self.user1, resource=self.res1))
-
-        self.assertRaises(ValueError, Booking.objects.create, start=start,
-                          end=end, resource=self.res1, user=self.user1)
-        self.assertRaises(ValueError, Booking.objects.create, start=start + timedelta(days=1),
-                          end=end - timedelta(days=1), resource=self.res1, user=self.user1)
+            Booking.objects.create(
+                start=start,
+                end=end,
+                owner=self.user1,
+                resource=self.res1,
+                config_bundle=self.config_bundle
+                )
+            )
+
+        self.assertRaises(
+            ValueError,
+            Booking.objects.create,
+            start=start,
+            end=end,
+            resource=self.res1,
+            owner=self.user1,
+            config_bundle=self.config_bundle
+            )
+        self.assertRaises(
+            ValueError,
+            Booking.objects.create,
+            start=start + timedelta(days=1),
+            end=end - timedelta(days=1),
+            resource=self.res1,
+            owner=self.user1,
+            config_bundle=self.config_bundle
+            )
+
+        self.assertRaises(
+            ValueError,
+            Booking.objects.create,
+            start=start - timedelta(days=1),
+            end=end,
+            resource=self.res1,
+            owner=self.user1,
+            config_bundle=self.config_bundle
+            )
+
+        self.assertRaises(
+            ValueError,
+            Booking.objects.create,
+            start=start - timedelta(days=1),
+            end=end - timedelta(days=1),
+            resource=self.res1,
+            owner=self.user1,
+            config_bundle=self.config_bundle
+            )
+
+        self.assertRaises(
+            ValueError,
+            Booking.objects.create,
+            start=start,
+            end=end + timedelta(days=1),
+            resource=self.res1,
+            owner=self.user1,
+            config_bundle=self.config_bundle
+            )
+
+        self.assertRaises(
+            ValueError,
+            Booking.objects.create,
+            start=start + timedelta(days=1),
+            end=end + timedelta(days=1),
+            resource=self.res1,
+            owner=self.user1,
+            config_bundle=self.config_bundle
+            )
 
-        self.assertRaises(ValueError, Booking.objects.create, start=start - timedelta(days=1),
-                          end=end, resource=self.res1, user=self.user1)
-        self.assertRaises(ValueError, Booking.objects.create, start=start - timedelta(days=1),
-                          end=end - timedelta(days=1), resource=self.res1, user=self.user1)
-
-        self.assertRaises(ValueError, Booking.objects.create, start=start,
-                          end=end + timedelta(days=1), resource=self.res1, user=self.user1)
-        self.assertRaises(ValueError, Booking.objects.create, start=start + timedelta(days=1),
-                          end=end + timedelta(days=1), resource=self.res1, user=self.user1)
+        self.assertTrue(
+            Booking.objects.create(
+                start=start - timedelta(days=1),
+                end=start,
+                owner=self.user1,
+                resource=self.res1,
+                config_bundle=self.config_bundle
+                )
+            )
+        self.assertTrue(
+            Booking.objects.create(
+                start=end,
+                end=end + timedelta(days=1),
+                owner=self.user1,
+                resource=self.res1,
+                config_bundle=self.config_bundle
+                )
+            )
 
-        self.assertTrue(Booking.objects.create(start=start - timedelta(days=1), end=start,
-                                               user=self.user1, resource=self.res1))
-        self.assertTrue(Booking.objects.create(start=end, end=end + timedelta(days=1),
-                                               user=self.user1, resource=self.res1))
+        self.assertTrue(
+            Booking.objects.create(
+                start=start - timedelta(days=2),
+                end=start - timedelta(days=1),
+                owner=self.user1,
+                resource=self.res1,
+                config_bundle=self.config_bundle
+                )
+            )
 
         self.assertTrue(
-            Booking.objects.create(start=start - timedelta(days=2), end=start - timedelta(days=1),
-                                   user=self.user1, resource=self.res1))
+            Booking.objects.create(
+                start=end + timedelta(days=1),
+                end=end + timedelta(days=2),
+                owner=self.user1,
+                resource=self.res1,
+                config_bundle=self.config_bundle
+                )
+            )
+
         self.assertTrue(
-            Booking.objects.create(start=end + timedelta(days=1), end=end + timedelta(days=2),
-                                   user=self.user1, resource=self.res1))
+            Booking.objects.create(
+                start=start,
+                end=end,
+                owner=self.user1,
+                resource=self.res2,
+                config_bundle=self.config_bundle
+                )
+            )
+
+    def test_extensions(self):
+        """
+        saving a booking with an extended end time is allows to happen twice,
+        and each extension must be a maximum of one week long
+        """
+        start = timezone.now()
+        end = start + timedelta(weeks=1)
         self.assertTrue(
-            Booking.objects.create(start=start, end=end,
-                                   user=self.user1, resource=self.res2, scenario=self.scenario,
-                                   installer=self.installer))
\ No newline at end of file
+            Booking.objects.create(
+                start=start,
+                end=end,
+                owner=self.user1,
+                resource=self.res1,
+                config_bundle=self.config_bundle
+            )
+        )
+
+        booking = Booking.objects.all().first()  # should be only thing in db
+
+        self.assertEquals(booking.ext_count, 2)
+        booking.end = booking.end + timedelta(days=3)
+        try:
+            booking.save()
+        except Exception:
+            self.fail("save() threw an exception")
+        booking.end = booking.end + timedelta(weeks=2)
+        self.assertRaises(ValueError, booking.save)
+        booking.end = booking.end - timedelta(days=8)
+        try:
+            self.assertTrue(booking.save())
+        except Exception:
+            self.fail("save() threw an exception")
+
diff --git a/src/booking/tests/test_views.py b/src/booking/tests/test_views.py
deleted file mode 100644
index c1da013..0000000
--- a/src/booking/tests/test_views.py
+++ /dev/null
@@ -1,106 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Max Breitenfeldt and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-
-from datetime import timedelta
-
-from django.test import Client
-from django.test import TestCase
-from django.urls import reverse
-from django.utils import timezone
-from django.utils.encoding import force_text
-from registration.forms import User
-
-from account.models import UserProfile
-from booking.models import Booking
-from dashboard.models import Resource
-from jenkins.models import JenkinsSlave
-
-
-class BookingViewTestCase(TestCase):
-    def setUp(self):
-        self.client = Client()
-        self.slave = JenkinsSlave.objects.create(name='test', url='test')
-        self.owner = User.objects.create(username='owner')
-        self.res1 = Resource.objects.create(name='res1', slave=self.slave, description='x',
-                                            url='x',owner=self.owner)
-        self.user1 = User.objects.create(username='user1')
-        self.user1.set_password('user1')
-        self.user1profile = UserProfile.objects.create(user=self.user1)
-        self.user1.save()
-
-        self.user1 = User.objects.get(pk=self.user1.id)
-
-
-    def test_resource_bookings_json(self):
-        url = reverse('booking:bookings_json', kwargs={'resource_id': 0})
-        self.assertEqual(self.client.get(url).status_code, 404)
-
-        url = reverse('booking:bookings_json', kwargs={'resource_id': self.res1.id})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertJSONEqual(force_text(response.content), {"bookings": []})
-        booking1 = Booking.objects.create(start=timezone.now(),
-                                          end=timezone.now() + timedelta(weeks=1), user=self.user1,
-                                          resource=self.res1)
-        response = self.client.get(url)
-        json = response.json()
-        self.assertEqual(response.status_code, 200)
-        self.assertIn('bookings', json)
-        self.assertEqual(len(json['bookings']), 1)
-        self.assertIn('start', json['bookings'][0])
-        self.assertIn('end', json['bookings'][0])
-        self.assertIn('id', json['bookings'][0])
-        self.assertIn('purpose', json['bookings'][0])
-
-    def test_booking_form_view(self):
-        url = reverse('booking:create', kwargs={'resource_id': 0})
-        self.assertEqual(self.client.get(url).status_code, 404)
-
-        # authenticated user
-        url = reverse('booking:create', kwargs={'resource_id': self.res1.id})
-        self.client.login(username='user1',password='user1')
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed('booking/booking_calendar.html')
-        self.assertTemplateUsed('booking/booking_form.html')
-        self.assertIn('resource', response.context)
-
-
-    def test_booking_view(self):
-        start = timezone.now()
-        end = start + timedelta(weeks=1)
-        booking = Booking.objects.create(start=start, end=end, user=self.user1, resource=self.res1)
-
-        url = reverse('booking:detail', kwargs={'booking_id':0})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 404)
-
-        url = reverse('booking:detail', kwargs={'booking_id':booking.id})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed('booking/booking_detail.html')
-        self.assertIn('booking', response.context)
-
-    def test_booking_list_view(self):
-        start = timezone.now() - timedelta(weeks=2)
-        end = start + timedelta(weeks=1)
-        Booking.objects.create(start=start, end=end, user=self.user1, resource=self.res1)
-
-        url = reverse('booking:list')
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed('booking/booking_list.html')
-        self.assertTrue(len(response.context['bookings']) == 0)
-
-        start = timezone.now()
-        end = start + timedelta(weeks=1)
-        Booking.objects.create(start=start, end=end, user=self.user1, resource=self.res1)
-        response = self.client.get(url)
-        self.assertTrue(len(response.context['bookings']) == 1)
\ No newline at end of file