From ecadb07367d31c0929212618e120130f54af78da Mon Sep 17 00:00:00 2001 From: Justin Choquette Date: Tue, 8 Aug 2023 11:33:57 -0400 Subject: MVP Change-Id: Ib590302f49e7e66f8d04841fb6cb97baf623f51a Signed-off-by: Justin Choquette --- src/templates/base/account/settings.html | 4 +- src/templates/base/base.html | 2 +- src/templates/base/booking/booking_detail.html | 64 ++++++++++++++---- src/templates/base/booking/booking_table.html | 4 -- src/templates/base/dashboard/lab_detail.html | 78 +++++++++------------- .../base/resource/hostprofile_detail.html | 60 ++++++++++------- src/templates/base/resource/hosts.html | 20 ++++-- src/templates/base/workflow/book_a_pod.html | 11 ++- src/templates/base/workflow/design_a_pod.html | 12 ++-- 9 files changed, 150 insertions(+), 105 deletions(-) (limited to 'src/templates') diff --git a/src/templates/base/account/settings.html b/src/templates/base/account/settings.html index d1939b7..611ae38 100644 --- a/src/templates/base/account/settings.html +++ b/src/templates/base/account/settings.html @@ -7,6 +7,9 @@ {% csrf_token %}
+ + +

To change your password and access advanced account management, please go here

{{ company_form }} {{ preference_form }}
@@ -42,7 +45,6 @@ $(window).on('load', function() { key_list.push('{{key}}') {% endfor %} update_json_list() - console.log(key_list) }); diff --git a/src/templates/base/base.html b/src/templates/base/base.html index cd4269c..9f1a598 100644 --- a/src/templates/base/base.html +++ b/src/templates/base/base.html @@ -138,7 +138,7 @@ Lab Info
- + Hosts diff --git a/src/templates/base/booking/booking_detail.html b/src/templates/base/booking/booking_detail.html index e4687ad..33b0486 100644 --- a/src/templates/base/booking/booking_detail.html +++ b/src/templates/base/booking/booking_detail.html @@ -61,8 +61,7 @@ code {
@@ -75,23 +74,18 @@ code { {% for host in statuses %} - - {% if host.status is 'Success' %} + {% if 'Success' in host.status %}
- {% elif host.status is 'InProgress' %} -
+ {% elif 'Fail' in host.status %} +
{% else %} -
+
{% endif %} {{ host.hostname }} - + {{ host.status }} @@ -102,4 +96,50 @@ code {
+
+
+
+
+ Diagnostic Information +
+
+ + + + + + +
Aggregate ID{{booking.aggregateId}}
+
+
+
+
+ + + {% endblock content %} diff --git a/src/templates/base/booking/booking_table.html b/src/templates/base/booking/booking_table.html index b4a713a..c7743ca 100644 --- a/src/templates/base/booking/booking_table.html +++ b/src/templates/base/booking/booking_table.html @@ -8,7 +8,6 @@ Project Start End - Operating System @@ -29,9 +28,6 @@ {{ booking.end }} - - {{ booking.resource.get_head_node.config.image.os.name }} - {% endfor %} diff --git a/src/templates/base/dashboard/lab_detail.html b/src/templates/base/dashboard/lab_detail.html index 3d90a51..cd096f6 100644 --- a/src/templates/base/dashboard/lab_detail.html +++ b/src/templates/base/dashboard/lab_detail.html @@ -12,7 +12,6 @@

Lab Profile

-
@@ -61,16 +60,15 @@

Host Profiles

-
- {% for profile in hostprofiles %} + {% for flavor in flavors %} - - - + + + {% endfor %}
{{profile.name}}{{profile.description}}Profile{{flavor.name}}{{flavor.description}}Profile
@@ -81,7 +79,6 @@

Networking Capabilities

-
@@ -96,63 +93,50 @@
-
-
-

Images

- -
-
-
- - - - - - - - {% for image in images %} - - - - - - - {% endfor %} -
NameOwnerFor Host TypeDescription
{{image.name}}{{image.owner}}{{image.host_type}}{{image.description}}
-
-
-

Lab Hosts

-
+ - {% for host in hosts %} - - - - - {% if host.working %} - - {% else %} - - {% endif %} - - - {% endfor %} + + + + + + + + {% endfor %}
NameArchitecture Profile Booked WorkingVendor
{{host.name}}{{host.profile}}{{host.booked|yesno:"Yes,No"}}YesNo{{host.vendor}}
+ {{ host.name }} + + {{ host.arch }} + + {{ host.flavor.name }} + + {% if host.allocation != null %} + Yes + {% else %} + No + {% endif %} + + {% if host.allocation.reason == "maintenance" %} + No + {% else %} + Yes + {% endif %} +
diff --git a/src/templates/base/resource/hostprofile_detail.html b/src/templates/base/resource/hostprofile_detail.html index 0b3262c..1cf2000 100644 --- a/src/templates/base/resource/hostprofile_detail.html +++ b/src/templates/base/resource/hostprofile_detail.html @@ -2,51 +2,46 @@ {% load staticfiles %} {% block content %} +

{{ flavor.name }}

Available at

-
    - {% for lab in hostprofile.labs.all %} -
  • {{lab.name}}
  • - {% endfor %} +
  • UNH IOL

RAM

-
- {{hostprofile.ramprofile.first.amount}}G, - {{hostprofile.ramprofile.first.channels}} channels + {{flavor.ram.value}} {{flavor.ram.unit}}

CPU

-
- + - + - +
Arch:{{hostprofile.cpuprofile.first.architecture}}{{ flavor.arch }}
Cores:{{hostprofile.cpuprofile.first.cores}}{{ flavor.cpu_count }}
Sockets:{{hostprofile.cpuprofile.first.cpus}}{{ flavor.sockets }}
@@ -54,31 +49,29 @@

Disk

-
- - + + - - + + - - + +
Size:{{hostprofile.storageprofile.first.size}} GiBDisk Size:{{flavor.disk_size.value}} {{flavor.disk_size.unit}}
Type:{{hostprofile.storageprofile.first.media_type}}Root Size:{{flavor.root_size.value}} {{flavor.root_size.unit}}
Mount Point:{{hostprofile.storageprofile.first.name}}Swap Size:{{flavor.swap_size.value}} {{flavor.swap_size.unit}}
-
+

Interfaces

-
@@ -89,10 +82,31 @@ - {% for intprof in hostprofile.interfaceprofile.all %} + {% for interface in flavor.interfaces %} + + + + + {% endfor %} + +
{{interface.name}}{{interface.speed.value}} {{interface.speed.unit}}
+
+
+
+
+

Images

+
+
+ + + + + + + + {% for image in flavor.images %} - - + {% endfor %} diff --git a/src/templates/base/resource/hosts.html b/src/templates/base/resource/hosts.html index 9fc50ce..e01916a 100644 --- a/src/templates/base/resource/hosts.html +++ b/src/templates/base/resource/hosts.html @@ -5,25 +5,37 @@ + - {% for host in hosts %} + {% for host in hosts %} + {% endfor %} diff --git a/src/templates/base/workflow/book_a_pod.html b/src/templates/base/workflow/book_a_pod.html index 7448dc5..8a0fb47 100644 --- a/src/templates/base/workflow/book_a_pod.html +++ b/src/templates/base/workflow/book_a_pod.html @@ -24,7 +24,7 @@

Book a Pod

-

Select Host Or Template:

+

Select Host Or Template*

@@ -46,7 +46,7 @@
-

Booking Details

+

Booking Details*

@@ -66,9 +66,6 @@
-
- -

Add Collaborators:

@@ -99,7 +96,7 @@
- +
@@ -144,7 +141,7 @@
diff --git a/src/templates/base/workflow/design_a_pod.html b/src/templates/base/workflow/design_a_pod.html index ab3f11b..32bd332 100644 --- a/src/templates/base/workflow/design_a_pod.html +++ b/src/templates/base/workflow/design_a_pod.html @@ -31,14 +31,14 @@

Design a Pod

-

Select a Lab:

+

Select a Lab*

-

Add Resources:

+

Add Resources*

@@ -51,7 +51,7 @@
-

Add Networks:

+

Add Networks*

@@ -64,14 +64,14 @@
-

Configure Connections:

+

Configure Connections*

-

Pod Details

+

Pod Details*

@@ -208,7 +208,7 @@
-- cgit 1.2.3-korg
Name
{{intprof.name}}{{intprof.speed}}{{image.name}}
NameArchitecture Profile Booked Working
{{ host.name }} - {{ host.profile }} + {{ host.arch }} - {{ host.booked|yesno:"Yes,No" }} + {{ host.flavor.name }} - {{ host.working|yesno:"Yes,No" }} + {% if host.allocation != null %} + Yes + {% else %} + No + {% endif %} + + {% if host.allocation.reason == "maintenance" %} + No + {% else %} + Yes + {% endif %}