diff options
| -rw-r--r-- | src/resource_inventory/models.py | 3 | ||||
| -rw-r--r-- | src/templates/booking/booking_table.html | 14 | ||||
| -rw-r--r-- | src/templates/dashboard/lab_detail.html | 1 | ||||
| -rw-r--r-- | src/templates/resource/steps/meta_info.html | 22 |
4 files changed, 30 insertions, 10 deletions
diff --git a/src/resource_inventory/models.py b/src/resource_inventory/models.py index 4e3974e..bdc1f5d 100644 --- a/src/resource_inventory/models.py +++ b/src/resource_inventory/models.py @@ -184,6 +184,9 @@ class ResourceBundle(models.Model): return "Resource bundle " + str(self.id) + " with no template" return "instance of " + str(self.template) + def get_host(self, role="Jumphost"): + return Host.objects.filter(bundle=self, config__opnfvRole__name=role).first() + # Networking diff --git a/src/templates/booking/booking_table.html b/src/templates/booking/booking_table.html index 5e82645..e0c5f49 100644 --- a/src/templates/booking/booking_table.html +++ b/src/templates/booking/booking_table.html @@ -5,11 +5,10 @@ <tr> <th>Owner</th> <th>Purpose</th> + <th>Project</th> <th>Start</th> <th>End</th> <th>Operating System</th> - <th>Installer</th> - <th>Scenario</th> </tr> </thead> <tbody> @@ -22,19 +21,16 @@ {{ booking.purpose }} </td> <td> - {{ booking.start }} - </td> - <td> - {{ booking.end }} + {{ booking.project }} </td> <td> - {{ booking.opsys }} + {{ booking.start }} </td> <td> - {{ booking.installer }} + {{ booking.end }} </td> <td> - {{ booking.scenario }} + {{ booking.resource.get_host.config.image.os.name }} </td> </tr> {% endfor %} diff --git a/src/templates/dashboard/lab_detail.html b/src/templates/dashboard/lab_detail.html index 4c06245..a30ac9e 100644 --- a/src/templates/dashboard/lab_detail.html +++ b/src/templates/dashboard/lab_detail.html @@ -62,7 +62,6 @@ <tr> <td>{{profile.name}}</td> <td>{{profile.description}}</td> - <td>{{profile.labs}}</td> </tr> {% endfor %} </table> diff --git a/src/templates/resource/steps/meta_info.html b/src/templates/resource/steps/meta_info.html index b458842..7a1b56a 100644 --- a/src/templates/resource/steps/meta_info.html +++ b/src/templates/resource/steps/meta_info.html @@ -5,6 +5,28 @@ {% block content %} +<style> +#resource_meta_form { + margin: 80px; + display: grid; +} + +#resource_meta_form td > * { + width: 100%; + margin-bottom: 20px; + margin-top: 20px; +} + +#resource_meta_form > table > tbody > tr { + border-bottom: 1px solid #cccccc; +} + +#resource_meta_form > table > tbody > tr:last-child { + border-bottom: none; +} + +</style> + <form id="resource_meta_form" method="post" action="/wf/workflow/"> {% csrf_token %} <table> |