aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-10-17Fix TypoParker Berberian1-1/+0
In one of the patchsets of LaaS 2.0 a typo was added. Change-Id: I02ff24bea345279df6643c0b1a4358ab2eff1d31 Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
2018-10-15Lab as a Service 2.0Parker Berberian234-2004/+15935
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>
2018-10-08Development Override Compose FileTrevor Bramwell11-51/+123
Now that images are built and hosted for the dashboard and worker container the compose file can reference upstream images instead of ones locally built. A second compose file is added which overrides compose configuration so that images are built locally. Initial commands for running the container are moved into 'init.sh' which gets copied into the image, since the current images cannot be ran by themselves as they require the command listed in the compose file. The compose version bumped from 2 to 3 as there are no version 2 specific features being used that need to be modified. Change-Id: I23813a859a676ba009cba8f5a62b7153da006eef Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-10-05Update Postgres UsageTrevor Bramwell3-15/+3
Setting POSTGRES_{DB,USER,PASSWORD} variables removes the need to volume mount the script for specifying the user and database. Change-Id: I7ee958c8d36702d1afd701e026b642ac84440ee8 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-10-01Use Upstream Rabbitmq Docker ContainerTrevor Bramwell5-21/+6
The upstream rabbitmq container supports specifying the default admin user and password through the environment variables: RABBITMQ_DEFAULT_USER and RABBITMQ_DEFAULT_PASS. Utilizing these variables removes the need to build a rabbitmq container specific to the Pharos LaaS Dashboard. Change-Id: I390d7fa9254a0f28b374235254caff59b219cd87 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-10-01Bump Python Cryptography Library VersionTrevor Bramwell2-2/+2
The underlying OpenSSL version changed in an upstream container which cryptography==1.4 did not support. Bumping the cryptography library fixes the build as they introduce broader support for OpenSSL versions in their newer releases. Change-Id: Ibd2f73aefebb39cc4121b77fa38aecb32b8494ae Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-07-20change ',' to '.' in settings.pywutianwei1-1/+1
Change-Id: I4f4a3419eef2aba407d772b39be62214b6b7142e Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-04-13Merge "Limit User Booking Length and Extensions"Parker Berberian5-4/+67
2018-04-13Merge "Gracefully Handle Missing Jenkins Utilization for Dev Pod"Parker Berberian1-19/+24
2018-03-27Implement Booking Cleanup TaskSawyer Bergeron3-2/+29
Jira: PHAROS-344 Two new settings in config.env allow setting 1) how "stale" an expired booking can get before being culled and 2) how many expired bookings are kept around before culling If either condition is met, expired bookings will be deleted until both are false. Change-Id: I6b091e93c6fe5d47b75ebf5325b717fa898c773c Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2018-03-26Gracefully Handle Missing Jenkins Utilization for Dev PodSawyer Bergeron1-19/+24
Jira: PHAROS-364 Change-Id: I0641c658914e600672151d7c0d1661acba794f0f Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2018-03-26Limit User Booking Length and ExtensionsSawyer Bergeron5-4/+67
Jira: PHAROS-363 Bookings can now only be 3 weeks upon creation with a maximum of 2 1 week extensions. Change-Id: I677770de3f62f188d23e60be6d71b42b25bf007e Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2018-02-28Merge "Allow Configuring 'DEFAULT_EMAIL_FROM' in Django"Parker Berberian2-0/+2
2018-02-27Allow Configuring 'DEFAULT_EMAIL_FROM' in DjangoTrevor Bramwell2-0/+2
This sets the default 'FROM' address in the header of outgoing emails from the system. Making this configurable allows users to specify the address notification emails come from. Change-Id: Ibe229ef503847411f4879d5715392f816a455733 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-02-22Link AUP from dashboardSawyer Bergeron1-1/+5
Jira: PHAROS-361 Link and associated text below booking confirmation button now direct users to Wiki#AUP and inform them that they agree to those policies by continuing. Change-Id: I18953cc71691a03290cbce979fbf500081ca3c10 Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2018-02-19Merge "Provide Interface for Booking Deletion"Parker Berberian5-4/+71
2018-02-19Provide Interface for Booking DeletionSawyer Bergeron5-4/+71
Jira: PHAROS-355 User can now delete their own booking by going to the detail view of their booking and clicking 'delete' Change-Id: I279da364c2a5dfd03b877d1236c610d0fef563bc Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2018-02-19Merge "Expose Limited User Info Through API"Parker Berberian3-0/+13
2018-02-19Merge "Remove the Booking Notification Cleanup Task"Parker Berberian1-2/+0
2018-02-19Merge "Remove RSA Files from Repo"Parker Berberian2-23/+0
2018-02-16Expose Limited User Info Through APISawyer Bergeron3-0/+13
Jira: PHAROS-362 Exposes info such as username and user email throught the API to facilitate better backend integration Change-Id: I8948f399000ffe41d5b75941f4a4195caaea91f4 Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2018-02-15Change opsys Label to Operating SystemSawyer Bergeron1-0/+1
Jira: PHAROS-360 This makes the booking UI more intuitive by clarifying a field Change-Id: Ic7806e72a1ab94d650064c2c8e8820853385c356 Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2018-02-12Merge "Ensure DEBUG is set as a Boolean"Parker Berberian1-1/+3
2018-02-12Merge "Use userprofile.email_addr in User List"Parker Berberian1-1/+1
2018-02-09Ensure DEBUG is set as a BooleanTrevor Bramwell1-1/+3
Since os.environ only allows strings DEBUG needs to be converted. Assigning DEBUG to the comparison of the strings is enough to get the correct value out. Change-Id: Ie104d2fc5de5906ad2830c5ed7cff3b1c0fda3c5 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-02-09Pull DEBUG Var From EnvironmentTrevor Bramwell1-1/+1
This is explictily set in settings.py and can't be changed without modifying the file. Change-Id: If2f06e25857e15405470254731f17765619f369a Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-02-09Use userprofile.email_addr in User ListSawyer Bergeron1-1/+1
Jira: None User List view in dashboard now uses the generally populated userprofile.email_addr field instead of user.email Change-Id: I1585ddf3cde293d33351a2ea036aa0a343fdd8b1 Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2018-02-02Remove the Booking Notification Cleanup TaskTrevor Bramwell1-2/+0
These are created by the notification django-app, but that app is no longer used or installed. This change should also keep the worker container from continuously restarting. Change-Id: Ifbdf15e7011375f3818179048ec6be4a83a53917 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-02-02Remove RSA Files from RepoTrevor Bramwell2-23/+0
Since these are in the .gitignore file they shouldn't be in the repo. Change-Id: Iaf4da94863d4edf10bdce924d33023ca2d679c64 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-01-31Merge "Add User-ID Field in Booking API Serializer"Parker Berberian1-1/+1
2018-01-18Add User-ID Field in Booking API SerializerSawyer Bergeron1-1/+1
Jira: None Change-Id: I217cf26b078461fa2300ee666bd4c2775c62316b Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2018-01-17Add Nullable Lab Field to ResourcesSawyer Bergeron6-5/+52
Jira: PHAROS-347 Resources are now possible to associate with lab instances upon creation Change-Id: Id8abbcc448a6d840d55e4bf5130dbec22c8bc58f
2018-01-09Implement Booking Modification InterfaceSawyer Bergeron14-39/+212
Jira: PHAROS-330 Users can change start date if it has not already occurred, and can change end date, purpose, and both installer and scenario. Standard checks apply similar to when initially creating a booking. Change-Id: Ibae7fe91a58bd6e0741db065265c05c3823bdc27 Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2018-01-09Merge "Create Lab Model"Jack Morgan3-2/+50
2018-01-09Fixes for Recent MergeSawyer Bergeron2-4/+4
Jira: None In a recent large merge, some code was lost in translation. This commit fixes a missing line in requirements.txt and removes a couple lines in dispatchers.py that lost relevance. Change-Id: I5ddf67fc1da6df40f84d60668cd59e6a1975912d Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2018-01-09Create Lab ModelSawyer Bergeron3-2/+50
Jira: PHAROS-346 Allows admin to instantiate lab instances Change-Id: I67f8ceb3bc76d4cdd09fb6f3a0b715af312f6f83 Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2018-01-08Merge "Implement Notification Framework with Initial Email Support"Jack Morgan22-212/+154
2018-01-08Merge "Add Dashboard OS Selection Menu on Booking"Jack Morgan9-9/+56
2018-01-02Implement Notification Framework with Initial Email SupportSawyer Bergeron22-212/+154
JIRA: None Notification/notifier objects are now created with title, content, sender, associated resource, and recipient and there is now support for emails at the very least to be sent as notifications. Change-Id: I456cf0e901d9a1e2a1e7d187dcc03d28fca003fb Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2017-12-14Merge "Add Boolean Option for Dev Pod in API"Jack Morgan1-1/+1
2017-12-14Merge "Fix Gitignore for Oauth Keys"Jack Morgan1-4/+2
2017-12-14Merge "Integrate Initial Email Support"Jack Morgan3-1/+4
2017-12-13Add Dashboard OS Selection Menu on BookingSawyer Bergeron9-9/+56
JIRA: PHAROS-326 Implement dropdown menu on pod booking page for user to select base OS, as well as associated support in API and pod status/booking status views This patch includes the migration file mentioned by Parker Berbarian Change-Id: I46a7b0e5e7020a89bc8fa0fe53c10bbda14a2e2d Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2017-12-12Add Boolean Option for Dev Pod in APISawyer Bergeron1-1/+1
Change-Id: I4f0a0fc0ac5d81ae9454e6cece060032f9b806f7 JIRA: None
2017-12-07Integrate Initial Email SupportSawyer Bergeron3-1/+4
JIRA: None Integrate ability for users to change email presented to admins with field initially filled with user's Jira associated email address This amend takes into account a streamlining change suggested by Parker Berbarian Change-Id: I677ce669f200e5cad70c198737118f0b7925bac5 Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2017-12-07Merge "Abstract Hard-Coded URLs to Config File"Jack Morgan3-4/+16
2017-12-01Fix Gitignore for Oauth KeysSawyer Bergeron1-4/+2
JIRA: None Gitignore file now properly ignores src/account/rsa.pem and src/account/rsa.pub Change-Id: I370a7d68cd2726540e4c7c294cc2de779f854f7a Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2017-11-03Abstract Hard-Coded URLs to Config FileSawyer Bergeron3-4/+16
JIRA: PHAROS-317 The Jenkins URL configuration now works the same as the Jira URL configuration, with a base URL in the config.env file, with settings.py calculating the final URLs to be used in adapter.py. Change-Id: I79b4784ab39afdb789a24e4c0f1e8a3ae3566421 Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
2017-10-09Add 'staticfiles' Template Tag to Base TemplateTrevor Bramwell1-0/+1
Without this tag the dashboard HTML will fail to render because it doesn't have a reference to the 'static' template tag. Change-Id: Id56d3b460dc848508c8ae549e7781ea876bdc52b Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-10-03Serve the OPNFV Logo LocallyTrevor Bramwell2-1/+1
Because the logo is currently being pulled from an external HTTP site, the site is being listed as insecure. Adding the OPNFV logo to static content should fix the warning and keep the previous error of the logo being moved from happening. Change-Id: I13cf83aa612f5589e304699f808ff7b105611fc4 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>