From 23d35dc2c56b8c2b5496b6f0a5fc62066b22bbc7 Mon Sep 17 00:00:00 2001 From: Sawyer Bergeron Date: Fri, 29 Oct 2021 15:11:29 -0400 Subject: Add Cloud Init Support Squashed commit of the following: commit afcee3cad5c091e78e909b83f8df49accf1af5b6 Author: Sawyer Bergeron Date: Mon Oct 11 22:02:16 2021 +0000 Prod cobbler hotfixes Signed-off-by: Sawyer Bergeron Change-Id: I092bc6d85a3b2c77bfbe24f3af0d2b7a5f75a8c3 commit 5ce0a52b17e530436c298e1b581d37bac853f5a7 Author: Sawyer Bergeron Date: Thu Oct 7 17:14:01 2021 -0400 Manually merge CI files Signed-off-by: Sawyer Bergeron Change-Id: Ic63d5da699578007ef2f2cc373350ded06c66971 commit 5b70b8f1b8bbbe6aeec43b8d8dfdc6b7cc68bc9c Author: Sawyer Bergeron Date: Thu Sep 30 16:33:01 2021 -0400 Fixes for collaborator field Signed-off-by: Sawyer Bergeron Change-Id: I3dbdedf26fa84617ea7680a0f99e032d88f1ea98 Signed-off-by: Sawyer Bergeron commit 529b2521627b17142284c55c744812129edc71e8 Merge: d555513 e9d72ce Author: Sawyer Bergeron Date: Thu Sep 30 14:03:55 2021 +0000 Merge "Push cloud config content for generated files into userdata_raw" into cobbler commit d55551394df73645e49ae2ae3e730a9f1c6af81d Author: Sawyer Bergeron Date: Thu Sep 30 10:02:32 2021 -0400 Better error handling for quick deploy Change-Id: I03a725dfee9ce2f119d72ef940cd08df5aee3dcc Signed-off-by: Sawyer Bergeron commit e9d72ce78a85c6ff2f3f8591bcbf4115f97318d5 Author: Sawyer Bergeron Date: Tue Sep 28 19:11:49 2021 -0400 Push cloud config content for generated files into userdata_raw Signed-off-by: Sawyer Bergeron Change-Id: Ieb8bd9b8b172b6bf11062f67f41fc78154cc7c89 commit 95d39c60f7e8062cabc8c1665080a2d2c8904234 Author: Sawyer Bergeron Date: Sat Sep 25 16:18:12 2021 -0400 Allow for "pod specific" vlan allocation for LFEDGE allocation case Signed-off-by: Sawyer Bergeron Change-Id: I8b75410145027f43eaf6de7bd5f1813af38d3e7f Signed-off-by: Sawyer Bergeron commit 2ebb82b5f344de1e17abd70c51c4cce765761dd1 Author: Sawyer Bergeron Date: Thu Sep 23 16:37:43 2021 -0400 Fix collaborator field with recent changes Signed-off-by: Sawyer Bergeron Change-Id: Id305de9b1567adf103c47d5180b0b28ebfdf1b5e commit a819fc1df86721eda36eee89d0235c89b3159d6b Author: Sawyer Bergeron Date: Tue Sep 7 11:28:35 2021 -0400 Add user specified CI file entry Signed-off-by: Sawyer Bergeron Change-Id: Ia920130612da8fcde9d1a0d5dde7861904857162 Signed-off-by: Sawyer Bergeron commit d93346a716bde5237b7cfef5c10ea56e4922b59a Author: Adam Hassick Date: Tue Jul 27 13:05:16 2021 +0000 Make C-I serialization work with current netconf rules Signed-off-by: Sawyer Bergeron Change-Id: If967e5e1f268c5bee3ad4496847662cf4de1187c Signed-off-by: Sawyer Bergeron commit 6ffb1fdf6ce7825770148bada5a4c54899e4ed36 Author: Adam Hassick Date: Tue Jun 29 16:49:27 2021 -0400 Cobbler model changes, new endpoints Signed-off-by: Adam Hassick Change-Id: If0a94730e92747127cef121ec4930a4c8bae6c92 Signed-off-by: Sawyer Bergeron Signed-off-by: Adam Hassick commit 49e2b407003b69551ddafa851639e83ec42a5b09 Author: Jacob Hodgdon Date: Fri May 14 15:42:56 2021 -0400 Color fixes for rebrand Signed-off-by: Jacob Hodgdon Change-Id: I5cf4ede598afa377db7ecec17d8dfef085e130ac commit a908da441bf6efcdb289a46d0c2761840138b1a5 Author: Sawyer Bergeron Date: Tue Jun 8 11:15:56 2021 -0400 Draft for cloud-init file generation Signed-off-by: Sawyer Bergeron Signed-off-by: Sawyer Bergeron Change-Id: I07f3a4a1ab67531cba2cc7e3de22e9bb860706e1 Signed-off-by: Sawyer Bergeron Signed-off-by: Sawyer Bergeron Change-Id: I392505174cbc07214c31c42aab2474a748e47913 Signed-off-by: Sawyer Bergeron --- src/templates/base/base.html | 6 ++ src/templates/base/booking/booking_detail.html | 65 ++++++++++++++++++++++ src/templates/base/booking/quick_deploy.html | 33 +++++++++-- src/templates/laas/base.html | 77 +++++++++++++++++++++++++- src/templates/lfedge/booking/quick_deploy.html | 8 +-- 5 files changed, 177 insertions(+), 12 deletions(-) (limited to 'src/templates') diff --git a/src/templates/base/base.html b/src/templates/base/base.html index 704bc3b..a5b79af 100644 --- a/src/templates/base/base.html +++ b/src/templates/base/base.html @@ -156,6 +156,12 @@ My Bookings + + My Configurations + + + My Snapshots + Lab Info diff --git a/src/templates/base/booking/booking_detail.html b/src/templates/base/booking/booking_detail.html index a014fea..4a8f35a 100644 --- a/src/templates/base/booking/booking_detail.html +++ b/src/templates/base/booking/booking_detail.html @@ -7,6 +7,12 @@ {% endblock %} + + {% block content %}
@@ -154,6 +160,65 @@
+
+
+

Diagnostic Information

+ +
+
+
+ + + + + + + + + {% for host in booking.resource.get_resources %} + + + + {% endfor %} +
Job ID: {{booking.job.id}}
CI Files
+ + + + + + + + + {% for ci_file in host.config.cloud_init_files.all %} + + + + + {% endfor %} +
Host:{{host.name}}
Configs:
{{ci_file.id}} + + +
+
+
+
+
diff --git a/src/templates/base/booking/quick_deploy.html b/src/templates/base/booking/quick_deploy.html index 5dc41e2..c51e234 100644 --- a/src/templates/base/booking/quick_deploy.html +++ b/src/templates/base/booking/quick_deploy.html @@ -3,6 +3,13 @@ {% load bootstrap4 %} {% block content %} + + {% bootstrap_form_errors form type='non_fields' %}
{% csrf_token %} @@ -18,7 +25,7 @@
-
+
{% bootstrap_field form.purpose %} {% bootstrap_field form.project %} @@ -31,19 +38,26 @@
{% block collab %} -
+
{{ form.users }}
{% endblock collab %} -
+
+
+
{% bootstrap_field form.hostname %} {% bootstrap_field form.image %}
+
+
+ {% bootstrap_field form.global_cloud_config %} +
+
@@ -88,15 +102,22 @@ function imageFilter() { var drop = document.getElementById("id_image"); var lab_pk = get_selected_value("lab"); - var host_pk = get_selected_value("resource"); + var profile_pk = get_selected_value("resource"); for (const childNode of drop.childNodes) { var image_object = sup_image_dict[childNode.value]; if (image_object) //weed out empty option { + console.log("image object:"); + console.log(image_object); const img_at_lab = image_object.lab == lab_pk; - const profiles = resource_profile_map[host_pk]; - const img_in_template = profiles && profiles.indexOf(image_object.host_profile) > -1 + const profiles = resource_profile_map[profile_pk]; + console.log("profiles are:"); + console.log(profiles); + console.log("profile map is:"); + console.log(resource_profile_map); + console.log("host profile is" + image_object.architecture); + const img_in_template = profiles && profiles.indexOf(image_object.architecture) > -1 childNode.disabled = !img_at_lab || !img_in_template; } } diff --git a/src/templates/laas/base.html b/src/templates/laas/base.html index 69e4976..f980268 100644 --- a/src/templates/laas/base.html +++ b/src/templates/laas/base.html @@ -2,11 +2,84 @@ {% load staticfiles %} {% block logo %} - +
- Anuket logo + LaaS Dashboard diff --git a/src/templates/lfedge/booking/quick_deploy.html b/src/templates/lfedge/booking/quick_deploy.html index dac3815..ccafd90 100644 --- a/src/templates/lfedge/booking/quick_deploy.html +++ b/src/templates/lfedge/booking/quick_deploy.html @@ -11,7 +11,7 @@

{% endblock form-text %} {% block collab %} -
+
{{ form.users }} @@ -21,8 +21,8 @@ {% block image_script %} {% endblock image_script %} -- cgit 1.2.3-korg