aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2020-06-23Merge "Revert "Enable OpenID""Sawyer Bergeron9-73/+2
2020-06-23Revert "Enable OpenID"Sawyer Bergeron9-73/+2
This reverts commit 596664b37c17b31f2b5faa0d5144e4317179e0ba. Reason for revert: seems to break things when keys aren't defined on fresh container build Change-Id: I4ef788062c8a6967afad4eb3695af85bc3a4718b Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2020-06-23Merge "Quick Booking Menu Resource Availibility"Sawyer Bergeron4-4/+121
2020-06-23Merge "Enable OpenID"Sawyer Bergeron9-2/+73
2020-06-23Enable OpenIDssmith9-2/+73
Signed-off-by: Sean Smith <ssmith@iol.unh.edu> Change-Id: I4397976dbafce1d9d1cccc52f0e705891e59153a
2020-06-23Quick Booking Menu Resource Availibilityssmith4-4/+121
Signed-off-by: Sean Smith <ssmith@iol.unh.edu> Change-Id: I79f411af8996698d2c553185eed0221792a348d0
2020-06-22Small Change to add a useful workflow transactionssmith1-0/+2
Change-Id: I635a74605871bfa53337e20635a86632457452df Signed-off-by: Sean Smith <ssmith@iol.unh.edu>
2020-06-18Fix jira loginSawyer Bergeron2-2/+9
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu> Change-Id: Ie179d2909f296291d8722f5e6c34a4cf748327de
2020-06-09Merge "Allow not setting image for multi-node pods"Sawyer Bergeron4-15/+31
2020-06-04Allow not setting image for multi-node podsSawyer Bergeron4-15/+31
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu> Change-Id: Ieee0802291901b4b14d756781fb2182bff9afae6 Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2020-05-28Some small fixes to launch Akrainossmith5-71/+32
Signed-off-by: Sean Smith <ssmith@iol.unh.edu> Change-Id: If64d15afa456b7bdf25d40015decb37b1a20da54
2020-05-20Reworks resource tests into model validation where possible.ssmith4-4/+167
Change-Id: Ieb77cc38a42345107c2cac62ba1499bd7974ad77 Signed-off-by: Sean Smith <ssmith@iol.unh.edu>
2020-05-15Merge resource branchSawyer Bergeron33-599/+750
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 <sawyerbergeron@gmail.com> Date: Thu Apr 2 14:05:26 2020 -0400 Start fixing workflow for model changes Change-Id: I79df975ef45abf2e6e69594d358bbd205938828f Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.com> Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu> commit 7a7e2182acd0ea94e19aba4926c3a12771b30a6d Author: sms1097 <ssmith@iol.unh.edu> Date: Tue Mar 31 15:13:06 2020 -0400 Working on workflow refactoring Change-Id: I4141b6aca98aff7bff9cb78a7d5594e25eb45e98 Signed-off-by: Sean Smith <ssmith@iol.unh.edu> commit c09050ae2814f07af58557b40f9ed3559063d2c7 Merge: 71438d9 b5ccdc4 Author: Parker Berberian <pberberian@iol.unh.edu> Date: Tue Mar 24 20:34:16 2020 +0000 Merge "Able to delete configurations and view lab details" into resource commit b5ccdc4ffbb883c20f2f6f69aeef5002aef5db53 Author: sms1097 <ssmith@iol.unh.edu> 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 <ssmith@iol.unh.edu> Change-Id: Id6748c6bea67773a861921394d88579730246598 commit 71438d9a35cdb316cece865c9d410aeffb0053d8 Merge: 5460d0d a758223 Author: Parker Berberian <pberberian@iol.unh.edu> 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 <pberberian@iol.unh.edu> 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 <ahassick@iol.unh.edu> 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 <ahassick@iol.unh.edu> Change-Id: I2d2e7aeb96b10c231804a62f37a476039c954b7b commit a9063a347c4ebef0e53a17f198468bb135772810 Author: Parker Berberian <pberberian@iol.unh.edu> 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 <pberberian@iol.unh.edu> Change-Id: I2a1e843fbaa7984225f2f80742dad59dc348fbf2 commit a758223f44c6fec595b055d7c9b232b00e9174a0 Author: Parker Berberian <pberberian@iol.unh.edu> Date: Tue Mar 17 11:07:32 2020 -0400 Add / Fix tests for refactor Change-Id: I0526d1942f87707082a4eb1c8c98910f84481c23 Signed-off-by: Parker Berberian <pberberian@iol.unh.edu> Author: Parker Berberian <pberberian@iol.unh.edu> Add "Pod" Column to booking list Signed-off-by: Parker Berberian <pberberian@iol.unh.edu> Change-Id: I270913283bf1e5815cadf622ba2fd5f98bb61675 Author: Parker Berberian <pberberian@iol.unh.edu> Fixes that make the Akraino dashboard work Signed-off-by: Parker Berberian <pberberian@iol.unh.edu> Change-Id: I81746473a4511ef7d46445a7b16809a6e9da100f Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu> Change-Id: I4b428e7c8a8d401d7bae95cba01077feb0332a7f Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2020-04-14Merge "Add user + user list to API"Parker Berberian15-86/+195
2020-04-14Add user + user list to APISawyer Bergeron3-1/+35
Change-Id: I15cf0c33b9d452fda47f97e3d9b43e00c1bf9bfd Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2020-03-17fixed bug in make_serverAdam Hassick1-2/+1
Change-Id: I4467d22dfa92282523bf65af641677f08842345b Signed-off-by: Adam Hassick <ahassick@iol.unh.edu>
2020-03-17Merge "Quick Deploy Fixes." into resourceSawyer Bergeron11-81/+154
2020-03-17Quick Deploy Fixes.Parker Berberian11-81/+154
Change-Id: I46d410af62e4962d235346ba56472aaacb9d3ff2 Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
2020-03-16Test resource templates now use the same lab as the image generated ↵Adam Hassick1-1/+1
alongside it. Signed-off-by: Adam Hassick <ahassick@iol.unh.edu> Change-Id: I22ce80b4d162dd31dc3bd2ff2bd7ee30d474a0dd (cherry picked from commit 064f145f218385a6401fa6be2ccbbc462e915c26)
2020-03-16Merge "Fix Query in api MakeHardwareConfig" into resourceSawyer Bergeron1-1/+1
2020-03-16Fix Server Interface MigrationParker Berberian1-1/+4
Before, the relation between host and interface was being lost Change-Id: I347ac71d7667adcedd2deea03edde155895e6a23 Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
2020-03-16Merge "Fixed a few bugs for the stats functions and created a few tests."Parker Berberian3-40/+104
2020-03-16Fixed a few bugs for the stats functions and created a few tests.Sean3-40/+104
Signed-off-by: Sean <ssmith@iol.unh.edu> Change-Id: I2e4598811bddabe5b7447c3a92d39d16acb77a03 Signed-off-by: Sean <ssmith@iol.unh.edu>
2020-03-16Merge "Test resource templates now use the same lab as the image generated ↵Parker Berberian32-864/+1271
alongside it."
2020-03-16Test resource templates now use the same lab as the image generated ↵Adam Hassick1-1/+1
alongside it. Signed-off-by: Adam Hassick <ahassick@iol.unh.edu> Change-Id: I22ce80b4d162dd31dc3bd2ff2bd7ee30d474a0dd
2020-03-16Fix Query in api MakeHardwareConfigParker Berberian1-1/+1
Change-Id: I9ced78e73f49343bcb41b8e0de25d8b0223b14bd Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
2020-03-16Fixing and adding tests for the new resource models.Parker Berberian4-154/+98
Change-Id: I4dd0569411b415a3e8a8de43d4b99e927e5b7821 Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
2020-03-12Add akraino template for dashboardAdam LeBlanc11-6/+99
Signed-off-by: Adam LeBlanc <aleblanc@iol.unh.edu> Change-Id: I02242e00779bcae7cd7622c2e891e4199c8d0e71 Signed-off-by: Adam LeBlanc <aleblanc@iol.unh.edu>
2020-02-27Improve Data MigrationParker Berberian8-157/+146
Improved migration files so that they preserve data Change-Id: I53283fd3fd207ed3f9773beea7b1ce2062b5bd9f Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
2020-02-21Update Docs for new development workflowParker Berberian2-2/+4
The new development workflow spawns a server at port 8000 and requires DEBUG to be True. Change-Id: I430b163b4847fbbdc147b2e6b707409e7220e40d Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
2020-02-20Add Migration FilesParker Berberian4-0/+538
Adds migration files with some custom logic to accompany the refactoring in resource_inventory. Change-Id: Id3b3e46913c1f9a102426a5c33d7a282f46e8b28 Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
2020-02-17js: use npm instead of bowerJeremy Plsek84-2260/+160
Bower is considered deprecated, so switch to npm. - Update all dependencies - Use npm's version of mxgraph - Use npm's version of jquery - Use npm's version of plotly - Fix mxgraph to use styles and images from the correct location - Removed random csrf token input in nav bar and use js to get csrf token - Remove all calendar and some resource files since they were not used Change-Id: I30d6bd91cded9547caa4c0a5247cd9f214fe9798 Signed-off-by: Jeremy Plsek <jplsek@iol.unh.edu>
2020-02-13Fix ImportsParker Berberian16-86/+104
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>
2020-02-12Modifies Resource Models for ongoing refactorParker Berberian11-608/+526
Change-Id: Ice88f53135f57aca8e2de4d69274e7d490f981a4 Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
2020-02-10Add getInterface() to Resource APIParker Berberian1-0/+10
Change-Id: I714b6054bfc199d55de9619672768f8fc1355747 Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
2020-02-06Merge "Fix booking errors"Parker Berberian2-2/+11
2020-02-06Merge "Updates Interface Models"Parker Berberian1-1/+1
2020-02-06Merge "Comments and Documentation"Parker Berberian42-144/+389
2020-02-04Updates Interface ModelsParker Berberian1-1/+1
Removes a redundant name field and adds an explicit ForeignKey mapping between Interface and InterfaceProfile Change-Id: I3472ef53b889d8d5557e4f083a15940c2022877d Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
2020-01-30Adds Template OverridesParker Berberian66-9/+57
Changes the structure of the template directories to allow a new project to define their own set of override templates that inherit from a common base. I have slightly modified landing.html here as an example. In comming changes we will try to move all the "laas" specific content into the laas directory Change-Id: I46151be182de901f870debb247b305ea34ae77ba Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
2020-01-30Fix booking errorsBrandon Lo2-2/+11
This implements Host model's "release" method and replaces an instance of Network to PhysicalNetwork. Change-Id: I99b0bedbde2dcd63411cbb1fbf9b4905fc9570b1 Signed-off-by: Brandon Lo <lobrandon1217@gmail.com>
2020-01-28Comments and DocumentationParker Berberian42-144/+389
This change adds a ton of comments and documentation across all the code. Change-Id: Ifee0a2f534e8584f14b0f13af4dda8dc70eb7553 Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
2020-01-28Begin Resource RefactorParker Berberian13-142/+253
Begins the Resource Refactor by creating new interfaces to the resources through a Resource super class and using that new interface in the api Change-Id: I15a8179bfe915d2cde6d658d056e11cbd2c70e43 Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
2019-12-19style: make more consistent stylesJeremy Plsek24-648/+614
- Fix indentation in places - User settings have better labels - Lab info title now the same as others - Add "empty" sections to be more helpful to the user. They are not using links, since most of the "workflow" is handled by javascript. - Update padding in places to better line up with other elements - Add padding to bootstrap notifications (add check for messages to not just have random padding on the top of the page) - Remove unnecessary text in a form - Remove card-body from table-only or list-only cards (lists and tables are now flush with cards) - Add bg-danger to not-working hosts - Replace True/False text shown to the user with Yes/No - Remove ":" from some headers - Vertical buttons are now in a button group - Add pre-wrap class to avoid pre from breaking box sizing on the booking detail page - Reduce table indent in pod card and add table overflow scrollbar Signed-off-by: Jeremy Plsek <jeremyplsek@gmail.com> Change-Id: If09dca2f2b7386c44eeeb817ef76e8f748e456da
2019-12-17devel: use mounts for developmentJeremy Plsek4-9/+24
This removes the need to rebuild the containers every time for simple changes during development. This does not include python dependencies since those are installed globally in the container. (I would have done the same for JS dependencies, but it's used in the static files.) Removed the background flag for running in dev mode when using make. It's easier to kill the servers (^C) and view logs of the server without needing to call separate commands later. Nginx is disabled in dev mode since the server and static files are handled by Django instead. Update readme to reflect upon changes made. Signed-off-by: Jeremy Plsek <jeremyplsek@gmail.com> Change-Id: I7888ca89021fca313e1043a7f94b5e1b7e12498c
2019-12-03Add warning email and notificationBrandon Lo11-9/+215
This adds the abandoned changes made to the notification system and also adds a simple task to check for expiring bookings and sends out emails and notifications. Change-Id: I1530d19f41cf93626bb642e6b269f9ec55860b81 Signed-off-by: Brandon Lo <lobrandon1217@gmail.com>
2019-11-12Merge "Allow public marked grb and configs to be shown"Parker Berberian3-2/+40
2019-11-07Allow public marked grb and configs to be shownBrandon Lo3-2/+40
Change-Id: I97f4965e8522cac1ceb5c0492e9aa0a2e128d266 Signed-off-by: Brandon Lo <lobrandon1217@gmail.com>
2019-11-07Bumps PostgreSQL VersionParker Berberian1-1/+1
The builds were failing because of incompatible version with the psycopg2 dependency. Bumping this version to latest fixes the issue. Change-Id: Ib6a2a0acb6031d61f45349c27276e866b6e6f975 Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
2019-11-05Merge "Rename pharos to laas"Parker Berberian27-46/+46