From 530271c247a4ce538e3aa69fd3893481fada44ab Mon Sep 17 00:00:00 2001 From: Sawyer Bergeron Date: Fri, 15 May 2020 14:58:37 -0400 Subject: Merge resource branch 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 Date: Thu Apr 2 14:05:26 2020 -0400 Start fixing workflow for model changes Change-Id: I79df975ef45abf2e6e69594d358bbd205938828f Signed-off-by: Sawyer Bergeron Signed-off-by: Sawyer Bergeron commit 7a7e2182acd0ea94e19aba4926c3a12771b30a6d Author: sms1097 Date: Tue Mar 31 15:13:06 2020 -0400 Working on workflow refactoring Change-Id: I4141b6aca98aff7bff9cb78a7d5594e25eb45e98 Signed-off-by: Sean Smith commit c09050ae2814f07af58557b40f9ed3559063d2c7 Merge: 71438d9 b5ccdc4 Author: Parker Berberian Date: Tue Mar 24 20:34:16 2020 +0000 Merge "Able to delete configurations and view lab details" into resource commit b5ccdc4ffbb883c20f2f6f69aeef5002aef5db53 Author: sms1097 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 Change-Id: Id6748c6bea67773a861921394d88579730246598 commit 71438d9a35cdb316cece865c9d410aeffb0053d8 Merge: 5460d0d a758223 Author: Parker Berberian 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 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 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 Change-Id: I2d2e7aeb96b10c231804a62f37a476039c954b7b commit a9063a347c4ebef0e53a17f198468bb135772810 Author: Parker Berberian 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 Change-Id: I2a1e843fbaa7984225f2f80742dad59dc348fbf2 commit a758223f44c6fec595b055d7c9b232b00e9174a0 Author: Parker Berberian Date: Tue Mar 17 11:07:32 2020 -0400 Add / Fix tests for refactor Change-Id: I0526d1942f87707082a4eb1c8c98910f84481c23 Signed-off-by: Parker Berberian Author: Parker Berberian Add "Pod" Column to booking list Signed-off-by: Parker Berberian Change-Id: I270913283bf1e5815cadf622ba2fd5f98bb61675 Author: Parker Berberian Fixes that make the Akraino dashboard work Signed-off-by: Parker Berberian Change-Id: I81746473a4511ef7d46445a7b16809a6e9da100f Signed-off-by: Sawyer Bergeron Change-Id: I4b428e7c8a8d401d7bae95cba01077feb0332a7f Signed-off-by: Sawyer Bergeron --- src/account/views.py | 22 +- src/api/models.py | 2 +- src/booking/forms.py | 9 +- src/booking/quick_deployer.py | 17 +- src/booking/tests/test_models.py | 48 +-- src/booking/tests/test_quick_booking.py | 52 +-- src/booking/views.py | 23 +- src/dashboard/testing_utils.py | 6 + src/dashboard/views.py | 7 +- src/resource_inventory/admin.py | 6 +- .../migrations/0013_auto_20200218_1536.py | 2 +- .../migrations/0015_resourcetemplate_copy_of.py | 19 + src/resource_inventory/models.py | 17 +- src/resource_inventory/pdf_templater.py | 2 +- src/resource_inventory/resource_manager.py | 21 +- src/static/js/dashboard.js | 222 +++++++++-- src/templates/akraino/booking/booking_table.html | 41 +++ src/templates/akraino/booking/quick_deploy.html | 8 + src/templates/base/account/configuration_list.html | 5 + src/templates/base/account/resource_list.html | 20 +- src/templates/base/base.html | 5 +- src/templates/base/booking/quick_deploy.html | 2 + src/templates/base/dashboard/lab_detail.html | 4 +- .../base/resource/steps/pod_definition.html | 25 +- src/workflow/booking_workflow.py | 10 +- src/workflow/forms.py | 11 +- src/workflow/models.py | 109 ++---- src/workflow/resource_bundle_workflow.py | 405 +++++++++++++++------ src/workflow/sw_bundle_workflow.py | 196 ---------- src/workflow/tests/test_steps.py | 4 +- src/workflow/views.py | 2 +- src/workflow/workflow_factory.py | 13 +- src/workflow/workflow_manager.py | 14 +- 33 files changed, 750 insertions(+), 599 deletions(-) create mode 100644 src/resource_inventory/migrations/0015_resourcetemplate_copy_of.py create mode 100644 src/templates/akraino/booking/booking_table.html delete mode 100644 src/workflow/sw_bundle_workflow.py diff --git a/src/account/views.py b/src/account/views.py index a8bb02b..d1cc813 100644 --- a/src/account/views.py +++ b/src/account/views.py @@ -29,6 +29,7 @@ from django.shortcuts import render from jira import JIRA from rest_framework.authtoken.models import Token + from account.forms import AccountSettingsForm from account.jira_util import SignatureMethod_RSA_SHA1 from account.models import UserProfile @@ -177,20 +178,15 @@ def account_resource_view(request): if not request.user.is_authenticated: return render(request, "dashboard/login.html", {'title': 'Authentication Required'}) template = "account/resource_list.html" - resources = ResourceTemplate.objects.filter( - owner=request.user).prefetch_related("configbundle_set") - mapping = {} - resource_list = [] - booking_mapping = {} - for grb in resources: - resource_list.append(grb) - mapping[grb.id] = [{"id": x.id, "name": x.name} for x in grb.configbundle_set.all()] - if Booking.objects.filter(resource__template=grb, end__gt=timezone.now()).exists(): - booking_mapping[grb.id] = "true" + + active_bundles = [book.resource for book in Booking.objects.filter( + owner=request.user, end__gte=timezone.now())] + active_resources = [bundle.template.id for bundle in active_bundles] + resource_list = list(ResourceTemplate.objects.filter(owner=request.user)) + context = { "resources": resource_list, - "grb_mapping": mapping, - "booking_mapping": booking_mapping, + "active_resources": active_resources, "title": "My Resources" } return render(request, template, context=context) @@ -260,7 +256,7 @@ def configuration_delete_view(request, config_id=None): config = get_object_or_404(ResourceTemplate, pk=config_id) if not request.user.id == config.owner.id: return HttpResponse('no') # 403? - if Booking.objects.filter(config_bundle=config, end__gt=timezone.now()).exists(): + if Booking.objects.filter(resource__template=config, end__gt=timezone.now()).exists(): return HttpResponse('no') config.delete() return HttpResponse('') diff --git a/src/api/models.py b/src/api/models.py index e41a44d..addc02d 100644 --- a/src/api/models.py +++ b/src/api/models.py @@ -979,7 +979,7 @@ class JobFactory(object): relation.config = relation.config relation.save() - hardware_config.set("image", "hostname", "power", "ipmi_create") + hardware_config.set("id", "image", "hostname", "power", "ipmi_create") hardware_config.save() @classmethod diff --git a/src/booking/forms.py b/src/booking/forms.py index b9c9231..886f0f6 100644 --- a/src/booking/forms.py +++ b/src/booking/forms.py @@ -11,8 +11,7 @@ from django.forms.widgets import NumberInput from workflow.forms import ( MultipleSelectFilterField, - MultipleSelectFilterWidget, - FormUtils) + MultipleSelectFilterWidget) from account.models import UserProfile from resource_inventory.models import Image, Installer, Scenario from workflow.forms import SearchableSelectMultipleField @@ -27,7 +26,7 @@ class QuickBookingForm(forms.Form): installer = forms.ModelChoiceField(queryset=Installer.objects.all(), required=False) scenario = forms.ModelChoiceField(queryset=Scenario.objects.all(), required=False) - def __init__(self, data=None, user=None, *args, **kwargs): + def __init__(self, data=None, user=None, lab_data=None, *args, **kwargs): if "default_user" in kwargs: default_user = kwargs.pop("default_user") else: @@ -47,8 +46,6 @@ class QuickBookingForm(forms.Form): **get_user_field_opts() ) - attrs = FormUtils.getLabData() - self.fields['filter_field'] = MultipleSelectFilterField(widget=MultipleSelectFilterWidget(**attrs)) self.fields['length'] = forms.IntegerField( widget=NumberInput( attrs={ @@ -60,6 +57,8 @@ class QuickBookingForm(forms.Form): ) ) + self.fields['filter_field'] = MultipleSelectFilterField(widget=MultipleSelectFilterWidget(**lab_data)) + def build_user_list(self): """ Build list of UserProfiles. diff --git a/src/booking/quick_deployer.py b/src/booking/quick_deployer.py index 951ff47..9cfc465 100644 --- a/src/booking/quick_deployer.py +++ b/src/booking/quick_deployer.py @@ -79,13 +79,14 @@ def update_template(old_template, image, hostname, user): lab=old_template.lab, description=old_template.description, public=False, - temporary=True + temporary=True, + copy_of=old_template ) for old_network in old_template.networks.all(): Network.objects.create( name=old_network.name, - bundle=old_template, + bundle=template, is_public=False ) # We are assuming there is only one opnfv config per public resource template @@ -105,7 +106,8 @@ def update_template(old_template, image, hostname, user): config = ResourceConfiguration.objects.create( profile=old_config.profile, image=image, - template=template + template=template, + is_head_node=old_config.is_head_node ) for old_iface_config in old_config.interface_configs.all(): @@ -127,6 +129,7 @@ def update_template(old_template, image, hostname, user): resource_config=config, opnfv_config=opnfv_config ) + return template def generate_opnfvconfig(scenario, installer, template): @@ -165,7 +168,6 @@ def check_invariants(request, **kwargs): image = kwargs['image'] scenario = kwargs['scenario'] lab = kwargs['lab'] - resource_template = kwargs['resource_template'] length = kwargs['length'] # check that image os is compatible with installer if installer in image.os.sup_installers.all(): @@ -176,8 +178,8 @@ def check_invariants(request, **kwargs): raise ValidationError("The chosen installer does not support the chosen scenario") if image.from_lab != lab: raise ValidationError("The chosen image is not available at the chosen hosting lab") - #TODO - #if image.host_type != host_profile: + # TODO + # if image.host_type != host_profile: # raise ValidationError("The chosen image is not available for the chosen host type") if not image.public and image.owner != request.user: raise ValidationError("You are not the owner of the chosen private image") @@ -217,11 +219,12 @@ def create_from_form(form, request): ResourceManager.getInstance().templateIsReservable(resource_template) - hconf = update_template(resource_template, image, hostname, request.user) + resource_template = update_template(resource_template, image, hostname, request.user) # if no installer provided, just create blank host opnfv_config = None if installer: + hconf = resource_template.getConfigs()[0] opnfv_config = generate_opnfvconfig(scenario, installer, resource_template) generate_hostopnfv(hconf, opnfv_config) diff --git a/src/booking/tests/test_models.py b/src/booking/tests/test_models.py index c8c8ea8..37eb655 100644 --- a/src/booking/tests/test_models.py +++ b/src/booking/tests/test_models.py @@ -11,13 +11,12 @@ from datetime import timedelta -from django.contrib.auth.models import Permission, User +from django.contrib.auth.models import User from django.test import TestCase from django.utils import timezone -# from booking.models import * from booking.models import Booking -from resource_inventory.models import ResourceBundle, GenericResourceBundle, ConfigBundle +from dashboard.testing_utils import make_resource_template, make_user class BookingModelTestCase(TestCase): @@ -27,8 +26,6 @@ class BookingModelTestCase(TestCase): Creates all the scafolding needed and tests the Booking model """ - count = 0 - def setUp(self): """ Prepare for Booking model tests. @@ -36,29 +33,9 @@ class BookingModelTestCase(TestCase): Creates all the needed models, such as users, resources, and configurations """ self.owner = User.objects.create(username='owner') - - self.res1 = ResourceBundle.objects.create( - template=GenericResourceBundle.objects.create( - name="gbundle" + str(self.count) - ) - ) - self.count += 1 - self.res2 = ResourceBundle.objects.create( - template=GenericResourceBundle.objects.create( - name="gbundle2" + str(self.count) - ) - ) - self.count += 1 - self.user1 = User.objects.create(username='user1') - - self.add_booking_perm = Permission.objects.get(codename='add_booking') - self.user1.user_permissions.add(self.add_booking_perm) - - self.user1 = User.objects.get(pk=self.user1.id) - self.config_bundle = ConfigBundle.objects.create( - owner=self.user1, - name="test config" - ) + self.res1 = make_resource_template(name="Test template 1") + self.res2 = make_resource_template(name="Test template 2") + self.user1 = make_user(username='user1') def test_start_end(self): """ @@ -76,7 +53,6 @@ class BookingModelTestCase(TestCase): end=end, resource=self.res1, owner=self.user1, - config_bundle=self.config_bundle ) end = start self.assertRaises( @@ -86,7 +62,6 @@ class BookingModelTestCase(TestCase): end=end, resource=self.res1, owner=self.user1, - config_bundle=self.config_bundle ) def test_conflicts(self): @@ -105,7 +80,6 @@ class BookingModelTestCase(TestCase): end=end, owner=self.user1, resource=self.res1, - config_bundle=self.config_bundle ) ) @@ -116,7 +90,6 @@ class BookingModelTestCase(TestCase): end=end, resource=self.res1, owner=self.user1, - config_bundle=self.config_bundle ) self.assertRaises( @@ -126,7 +99,6 @@ class BookingModelTestCase(TestCase): end=end - timedelta(days=1), resource=self.res1, owner=self.user1, - config_bundle=self.config_bundle ) self.assertRaises( @@ -136,7 +108,6 @@ class BookingModelTestCase(TestCase): end=end, resource=self.res1, owner=self.user1, - config_bundle=self.config_bundle ) self.assertRaises( @@ -146,7 +117,6 @@ class BookingModelTestCase(TestCase): end=end - timedelta(days=1), resource=self.res1, owner=self.user1, - config_bundle=self.config_bundle ) self.assertRaises( @@ -156,7 +126,6 @@ class BookingModelTestCase(TestCase): end=end + timedelta(days=1), resource=self.res1, owner=self.user1, - config_bundle=self.config_bundle ) self.assertRaises( @@ -166,7 +135,6 @@ class BookingModelTestCase(TestCase): end=end + timedelta(days=1), resource=self.res1, owner=self.user1, - config_bundle=self.config_bundle ) self.assertTrue( @@ -175,7 +143,6 @@ class BookingModelTestCase(TestCase): end=start, owner=self.user1, resource=self.res1, - config_bundle=self.config_bundle ) ) @@ -185,7 +152,6 @@ class BookingModelTestCase(TestCase): end=end + timedelta(days=1), owner=self.user1, resource=self.res1, - config_bundle=self.config_bundle ) ) @@ -195,7 +161,6 @@ class BookingModelTestCase(TestCase): end=start - timedelta(days=1), owner=self.user1, resource=self.res1, - config_bundle=self.config_bundle ) ) @@ -205,7 +170,6 @@ class BookingModelTestCase(TestCase): end=end + timedelta(days=2), owner=self.user1, resource=self.res1, - config_bundle=self.config_bundle ) ) @@ -215,7 +179,6 @@ class BookingModelTestCase(TestCase): end=end, owner=self.user1, resource=self.res2, - config_bundle=self.config_bundle ) ) @@ -234,7 +197,6 @@ class BookingModelTestCase(TestCase): end=end, owner=self.user1, resource=self.res1, - config_bundle=self.config_bundle ) ) diff --git a/src/booking/tests/test_quick_booking.py b/src/booking/tests/test_quick_booking.py index 5ba1744..f405047 100644 --- a/src/booking/tests/test_quick_booking.py +++ b/src/booking/tests/test_quick_booking.py @@ -14,17 +14,15 @@ from django.test import TestCase, Client from booking.models import Booking from dashboard.testing_utils import ( - make_host, make_user, make_user_profile, make_lab, - make_installer, make_image, - make_scenario, make_os, - make_complete_host_profile, make_opnfv_role, make_public_net, + make_resource_template, + make_server ) @@ -36,15 +34,13 @@ class QuickBookingValidFormTestCase(TestCase): cls.user.save() make_user_profile(cls.user, True) - lab_user = make_user(True) - cls.lab = make_lab(lab_user) + cls.lab = make_lab() - cls.host_profile = make_complete_host_profile(cls.lab) - cls.scenario = make_scenario() - cls.installer = make_installer([cls.scenario]) - os = make_os([cls.installer]) - cls.image = make_image(cls.lab, 1, cls.user, os, cls.host_profile) - cls.host = make_host(cls.host_profile, cls.lab) + cls.res_template = make_resource_template(owner=cls.user, lab=cls.lab) + cls.res_profile = cls.res_template.getConfigs()[0].profile + os = make_os() + cls.image = make_image(cls.res_profile, lab=cls.lab, owner=cls.user, os=os) + cls.server = make_server(cls.res_profile, cls.lab) cls.role = make_opnfv_role() cls.pubnet = make_public_net(10, cls.lab) @@ -55,10 +51,10 @@ class QuickBookingValidFormTestCase(TestCase): def build_post_data(cls): return { 'filter_field': json.dumps({ - "host": { - "host_" + str(cls.host_profile.id): { + "resource": { + "resource_" + str(cls.res_profile.id): { "selected": True, - "id": cls.host_profile.id + "id": cls.res_template.id } }, "lab": { @@ -75,8 +71,6 @@ class QuickBookingValidFormTestCase(TestCase): 'users': '', 'hostname': 'my_host', 'image': str(cls.image.id), - 'installer': str(cls.installer.id), - 'scenario': str(cls.scenario.id) } def post(self, changed_fields={}): @@ -97,15 +91,10 @@ class QuickBookingValidFormTestCase(TestCase): self.assertLess(delta, datetime.timedelta(minutes=1)) resource_bundle = booking.resource - config_bundle = booking.config_bundle - opnfv_config = config_bundle.opnfv_config.first() - self.assertEqual(self.installer, opnfv_config.installer) - self.assertEqual(self.scenario, opnfv_config.scenario) - - host = resource_bundle.hosts.first() - self.assertEqual(host.profile, self.host_profile) - self.assertEqual(host.template.resource.name, 'my_host') + host = resource_bundle.get_resources()[0] + self.assertEqual(host.profile, self.res_profile) + self.assertEqual(host.name, 'my_host') def test_with_too_long_length(self): response = self.post({'length': '22'}) @@ -133,10 +122,10 @@ class QuickBookingValidFormTestCase(TestCase): def test_with_invalid_host_id(self): response = self.post({'filter_field': json.dumps({ - "host": { - "host_" + str(self.host_profile.id + 100): { + "resource": { + "resource_" + str(self.res_profile.id + 100): { "selected": True, - "id": self.host_profile.id + 100 + "id": self.res_profile.id + 100 } }, "lab": { @@ -151,12 +140,11 @@ class QuickBookingValidFormTestCase(TestCase): self.assertIsNone(Booking.objects.first()) def test_with_invalid_lab_id(self): - response = self.post({'filter_field': '{"hosts":[{"host_' + str(self.host_profile.id) + '":"true"}], "labs": [{"lab_' + str(self.lab.lab_user.id + 100) + '":"true"}]}'}) response = self.post({'filter_field': json.dumps({ - "host": { - "host_" + str(self.host_profile.id): { + "resource": { + "resource_" + str(self.res_profile.id): { "selected": True, - "id": self.host_profile.id + "id": self.res_profile.id } }, "lab": { diff --git a/src/booking/views.py b/src/booking/views.py index daaf026..3c95e07 100644 --- a/src/booking/views.py +++ b/src/booking/views.py @@ -19,11 +19,11 @@ from django.db.models import Q from django.urls import reverse from resource_inventory.models import ResourceBundle, ResourceProfile, Image, ResourceQuery -from resource_inventory.resource_manager import ResourceManager -from account.models import Lab, Downtime +from account.models import Downtime from booking.models import Booking from booking.stats import StatisticsManager from booking.forms import HostReImageForm +from workflow.forms import FormUtils from api.models import JobFactory from workflow.views import login from booking.forms import QuickBookingForm @@ -40,21 +40,16 @@ def quick_create(request): if request.method == 'GET': context = {} - - r_manager = ResourceManager.getInstance() - templates = {} - for lab in Lab.objects.all(): - templates[str(lab)] = r_manager.getAvailableResourceTemplates(lab, request.user) - - context['lab_profile_map'] = templates - - context['form'] = QuickBookingForm(default_user=request.user.username, user=request.user) - + attrs = FormUtils.getLabData(user=request.user) + context['form'] = QuickBookingForm(lab_data=attrs, default_user=request.user.username, user=request.user) + context['lab_profile_map'] = {} context.update(drop_filter(request.user)) - return render(request, 'booking/quick_deploy.html', context) + if request.method == 'POST': - form = QuickBookingForm(request.POST, user=request.user) + attrs = FormUtils.getLabData(user=request.user) + form = QuickBookingForm(request.POST, lab_data=attrs, user=request.user) + context = {} context['lab_profile_map'] = {} context['form'] = form diff --git a/src/dashboard/testing_utils.py b/src/dashboard/testing_utils.py index b7272ea..d7a346e 100644 --- a/src/dashboard/testing_utils.py +++ b/src/dashboard/testing_utils.py @@ -178,6 +178,9 @@ def make_vlan_manager(vlans=None, block_size=20, allow_overlapping=False, reserv def make_lab(user=None, name="Test_Lab_Instance", status=LabStatus.UP, vlan_manager=None, pub_net_count=5): + if Lab.objects.filter(name=name).exists(): + return Lab.objects.get(name=name) + if not vlan_manager: vlan_manager = make_vlan_manager() @@ -207,6 +210,9 @@ resource_inventory instantiation section for permanent resources def make_resource_profile(lab, name="test_hostprofile"): + if ResourceProfile.objects.filter(name=name).exists(): + return ResourceProfile.objects.get(name=name) + resource_profile = ResourceProfile.objects.create( name=name, description='test resourceprofile instance' diff --git a/src/dashboard/views.py b/src/dashboard/views.py index 498bd9d..2ace2d4 100644 --- a/src/dashboard/views.py +++ b/src/dashboard/views.py @@ -15,7 +15,7 @@ from django.shortcuts import render from account.models import Lab -from resource_inventory.models import Image, ResourceProfile +from resource_inventory.models import Image, ResourceProfile, ResourceQuery from workflow.workflow_manager import ManagerTracker @@ -37,14 +37,17 @@ def lab_detail_view(request, lab_name): if user: images = images | Image.objects.filter(from_lab=lab).filter(owner=user) + hosts = ResourceQuery.filter(lab=lab) + return render( request, "dashboard/lab_detail.html", { 'title': "Lab Overview", 'lab': lab, - 'hostprofiles': lab.hostprofiles.all(), + 'hostprofiles': ResourceProfile.objects.filter(labs=lab), 'images': images, + 'hosts': hosts } ) diff --git a/src/resource_inventory/admin.py b/src/resource_inventory/admin.py index 13afd99..439dad3 100644 --- a/src/resource_inventory/admin.py +++ b/src/resource_inventory/admin.py @@ -30,7 +30,9 @@ from resource_inventory.models import ( OPNFVConfig, OPNFVRole, Image, - RemoteInfo + RemoteInfo, + PhysicalNetwork, + NetworkConnection ) admin.site.register([ @@ -53,4 +55,6 @@ admin.site.register([ OPNFVConfig, OPNFVRole, Image, + PhysicalNetwork, + NetworkConnection, RemoteInfo]) diff --git a/src/resource_inventory/migrations/0013_auto_20200218_1536.py b/src/resource_inventory/migrations/0013_auto_20200218_1536.py index d9dcbd6..053453b 100644 --- a/src/resource_inventory/migrations/0013_auto_20200218_1536.py +++ b/src/resource_inventory/migrations/0013_auto_20200218_1536.py @@ -15,7 +15,7 @@ def clear_resource_bundles(apps, schema_editor): def create_default_template(apps, schema_editor): ResourceTemplate = apps.get_model('resource_inventory', 'ResourceTemplate') - ResourceTemplate.objects.create(id=1, name="Default Template") + ResourceTemplate.objects.create(name="Default Template", hidden=True) def populate_servers(apps, schema_editor): diff --git a/src/resource_inventory/migrations/0015_resourcetemplate_copy_of.py b/src/resource_inventory/migrations/0015_resourcetemplate_copy_of.py new file mode 100644 index 0000000..322dc00 --- /dev/null +++ b/src/resource_inventory/migrations/0015_resourcetemplate_copy_of.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2 on 2020-04-13 13:56 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('resource_inventory', '0014_auto_20200305_1415'), + ] + + operations = [ + migrations.AddField( + model_name='resourcetemplate', + name='copy_of', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='resource_inventory.ResourceTemplate'), + ), + ] diff --git a/src/resource_inventory/models.py b/src/resource_inventory/models.py index 7115ece..d1b7a75 100644 --- a/src/resource_inventory/models.py +++ b/src/resource_inventory/models.py @@ -155,16 +155,18 @@ class ResourceTemplate(models.Model): # TODO: template might not be a good name because this is a collection of lots of configured resources id = models.AutoField(primary_key=True) - name = models.CharField(max_length=300, unique=True) + name = models.CharField(max_length=300) xml = models.TextField() owner = models.ForeignKey(User, null=True, on_delete=models.SET_NULL) lab = models.ForeignKey(Lab, null=True, on_delete=models.SET_NULL, related_name="resourcetemplates") description = models.CharField(max_length=1000, default="") public = models.BooleanField(default=False) temporary = models.BooleanField(default=False) + copy_of = models.ForeignKey("ResourceTemplate", null=True, on_delete=models.SET_NULL) def getConfigs(self): - return list(self.resourceConfigurations.all()) + configs = self.resourceConfigurations.all() + return list(configs) def __str__(self): return self.name @@ -191,6 +193,13 @@ class ResourceBundle(models.Model): # TODO pass + def get_template_name(self): + if not self.template: + return "" + if not self.template.temporary: + return self.template.name + return self.template.copy_of.name + class ResourceConfiguration(models.Model): """Model to represent a complete configuration for a single physical Resource.""" @@ -200,7 +209,7 @@ class ResourceConfiguration(models.Model): image = models.ForeignKey("Image", on_delete=models.PROTECT) template = models.ForeignKey(ResourceTemplate, related_name="resourceConfigurations", null=True, on_delete=models.CASCADE) is_head_node = models.BooleanField(default=False) - # name? + name = models.CharField(max_length=3000, default="") def __str__(self): return "config with " + str(self.template) + " and image " + str(self.image) @@ -428,7 +437,7 @@ class InterfaceConfiguration(models.Model): connections = models.ManyToManyField(NetworkConnection) def __str__(self): - return "type " + str(self.profile) + " on host " + str(self.host) + return "type " + str(self.profile) + " on host " + str(self.resource_config) """ diff --git a/src/resource_inventory/pdf_templater.py b/src/resource_inventory/pdf_templater.py index 367ba43..27a264e 100644 --- a/src/resource_inventory/pdf_templater.py +++ b/src/resource_inventory/pdf_templater.py @@ -10,7 +10,7 @@ from django.template.loader import render_to_string import booking -from resource_inventory.models import Server, InterfaceProfile +from resource_inventory.models import Server class PDFTemplater: diff --git a/src/resource_inventory/resource_manager.py b/src/resource_inventory/resource_manager.py index 4310f8c..4d539bd 100644 --- a/src/resource_inventory/resource_manager.py +++ b/src/resource_inventory/resource_manager.py @@ -17,6 +17,7 @@ from resource_inventory.models import ( Network, Vlan, PhysicalNetwork, + InterfaceConfiguration, ) @@ -33,10 +34,12 @@ class ResourceManager: ResourceManager.instance = ResourceManager() return ResourceManager.instance - def getAvailableResourceTemplates(self, lab, user): - templates = ResourceTemplate.objects.filter(lab=lab) - templates = templates.filter(Q(owner=user) | Q(public=True)).filter(temporary=False) - return templates + def getAvailableResourceTemplates(self, lab, user=None): + filter = Q(public=True) + if user: + filter = filter | Q(owner=user) + filter = filter & Q(temporary=False) & Q(lab=lab) + return ResourceTemplate.objects.filter(filter) def templateIsReservable(self, resource_template): """ @@ -110,9 +113,15 @@ class ResourceManager: def configureNetworking(self, resource, vlan_map): for physical_interface in resource.interfaces.all(): - iface_config = physical_interface.acts_as - if not iface_config: + # assign interface configs + iface_configs = InterfaceConfiguration.objects.filter(profile=physical_interface.profile, resource_config=resource.config) + if iface_configs.count() != 1: continue + iface_config = iface_configs.first() + physical_interface.acts_as = iface_config + physical_interface.acts_as.save() + #if not iface_config: + # continue physical_interface.config.clear() for connection in iface_config.connections.all(): physicalNetwork = PhysicalNetwork.objects.create( diff --git a/src/static/js/dashboard.js b/src/static/js/dashboard.js index 6bff8d9..10c7d84 100644 --- a/src/static/js/dashboard.js +++ b/src/static/js/dashboard.js @@ -408,11 +408,8 @@ class MultipleSelectFilterWidget { this.dropdown_count++; const label = document.createElement("H5") label.appendChild(document.createTextNode(node['name'])) - label.classList.add("p-1", "m-1"); + label.classList.add("p-1", "m-1", "flex-grow-1"); div.appendChild(label); - let input = this.make_input(div, node, prepopulate); - input.classList.add("flex-grow-1", "p-1", "m-1"); - div.appendChild(input); let remove_btn = this.make_remove_button(div, node); remove_btn.classList.add("p-1", "m-1"); div.appendChild(remove_btn); @@ -425,10 +422,10 @@ class MultipleSelectFilterWidget { const node = this.filter_items[node_id] const parent = div.parentNode; div.parentNode.removeChild(div); - delete this.result[node.class][node.id]['values'][div.id]; + this.result[node.class][node.id]['count']--; //checks if we have removed last item in class - if(jQuery.isEmptyObject(this.result[node.class][node.id]['values'])){ + if(this.result[node.class][node.id]['count'] == 0){ delete this.result[node.class][node.id]; this.clear(node); } @@ -444,9 +441,9 @@ class MultipleSelectFilterWidget { updateObjectResult(node, childKey, childValue){ if(!this.result[node.class][node.id]) - this.result[node.class][node.id] = {selected: true, id: node.model_id, values: {}} + this.result[node.class][node.id] = {selected: true, id: node.model_id, count: 0} - this.result[node.class][node.id]['values'][childKey] = childValue; + this.result[node.class][node.id]['count']++; } finish(){ @@ -455,9 +452,41 @@ class MultipleSelectFilterWidget { } class NetworkStep { - constructor(debug, xml, hosts, added_hosts, removed_host_ids, graphContainer, overviewContainer, toolbarContainer){ - if(!this.check_support()) + // expects: + // + // debug: bool + // resources: { + // id: { + // id: int, + // value: { + // description: string, + // }, + // interfaces: [ + // id: int, + // name: str, + // description: str, + // connections: [ + // { + // network: int, [networks.id] + // tagged: bool + // } + // ], + // ], + // } + // } + // networks: { + // id: { + // id: int, + // name: str, + // public: bool, + // } + // } + // + constructor(debug, resources, networks, graphContainer, overviewContainer, toolbarContainer){ + if(!this.check_support()) { + console.log("Aborting, browser is not supported"); return; + } this.currentWindow = null; this.netCount = 0; @@ -470,9 +499,24 @@ class NetworkStep { this.editor = new mxEditor(); this.graph = this.editor.graph; + window.global_graph = this.graph; + window.network_rr_index = 5; + this.editor.setGraphContainer(graphContainer); this.doGlobalConfig(); - this.prefill(xml, hosts, added_hosts, removed_host_ids); + + let mx_networks = {} + + for(const network_id in networks) { + let network = networks[network_id]; + + mx_networks[network_id] = this.populateNetwork(network); + } + + this.prefillHosts(resources, mx_networks); + + //this.addToolbarButton(this.editor, toolbarContainer, 'zoomIn', '', "/static/img/mxgraph/zoom_in.png", true); + //this.addToolbarButton(this.editor, toolbarContainer, 'zoomOut', '', "/static/img/mxgraph/zoom_out.png", true); this.addToolbarButton(this.editor, toolbarContainer, 'zoomIn', 'fa-search-plus'); this.addToolbarButton(this.editor, toolbarContainer, 'zoomOut', 'fa-search-minus'); @@ -489,10 +533,6 @@ class NetworkStep { this.graph.addListener(mxEvent.CELL_CONNECTED, function(sender, event) {this.cellConnectionHandler(sender, event)}.bind(this)); //hooks up double click functionality this.graph.dblClick = function(evt, cell) {this.doubleClickHandler(evt, cell);}.bind(this); - - if(!this.has_public_net){ - this.addPublicNetwork(); - } } check_support(){ @@ -503,22 +543,84 @@ class NetworkStep { return true; } - prefill(xml, hosts, added_hosts, removed_host_ids){ - //populate existing data - if(xml){ - this.restoreFromXml(xml, this.editor); - } else if(hosts){ - for(const host of hosts) - this.makeHost(host); - } + /** + * Expects + * mx_interface: mxCell for the interface itself + * network: mxCell for the outer network + * tagged: bool + */ + connectNetwork(mx_interface, network, tagged) { + var cell = new mxCell( + "connection from " + network + " to " + mx_interface, + new mxGeometry(0, 0, 50, 50)); + cell.edge = true; + cell.geometry.relative = true; + cell.setValue(JSON.stringify({tagged: tagged})); + + let terminal = this.getClosestNetworkCell(mx_interface.geometry.y, network); + let edge = this.graph.addEdge(cell, null, mx_interface, terminal); + this.colorEdge(edge, terminal, true); + this.graph.refresh(edge); + } - //apply any changes - if(added_hosts){ - for(const host of added_hosts) - this.makeHost(host); - this.updateHosts([]); //TODO: why? + /** + * Expects: + * + * to: desired y axis position of the matching cell + * within: graph cell for a full network, with all child cells + * + * Returns: + * an mx cell, the one vertically closest to the desired value + * + * Side effect: + * modifies the on the parameter + */ + getClosestNetworkCell(to, within) { + if(window.network_rr_index === undefined) { + window.network_rr_index = 5; + } + + let child_keys = within.children.keys(); + let children = Array.from(within.children); + let index = (window.network_rr_index++) % children.length; + + let child = within.children[child_keys[index]]; + + return children[index]; + } + + /** Expects + * + * hosts: { + * id: { + * id: int, + * value: { + * description: string, + * }, + * interfaces: [ + * id: int, + * name: str, + * description: str, + * connections: [ + * { + * network: int, [networks.id] + * tagged: bool + * } + * ], + * ], + * } + * } + * + * network_mappings: { + * : + * } + * + * draws given hosts into the mxgraph + */ + prefillHosts(hosts, network_mappings){ + for(const host_id in hosts) { + this.makeHost(hosts[host_id], network_mappings); } - this.updateHosts(removed_host_ids); } cellConnectionHandler(sender, event){ @@ -625,7 +727,10 @@ class NetworkStep { color = kvp[1]; } } + edge.setStyle('strokeColor=' + color); + } else { + console.log("Failed to color " + edge + ", " + terminal + ", " + source); } } @@ -848,6 +953,7 @@ class NetworkStep { return true; } } + return false; }; @@ -926,6 +1032,27 @@ class NetworkStep { return ret_val; } + // expects: + // + // { + // id: int, + // name: str, + // public: bool, + // } + // + // returns: + // mxgraph id of network + populateNetwork(network) { + let mxNet = this.makeMxNetwork(network.name, network.public); + this.makeSidebarNetwork(network.name, mxNet.color, mxNet.element_id); + + if( network.public ) { + this.has_public_net = true; + } + + return mxNet.element_id; + } + addPublicNetwork() { const net = this.makeMxNetwork("public", true); this.makeSidebarNetwork("public", net['color'], net['element_id']); @@ -986,7 +1113,33 @@ class NetworkStep { document.getElementById("network_list").appendChild(newNet); } - makeHost(hostInfo) { + /** + * Expects format: + * { + * 'id': int, + * 'value': { + * 'description': string, + * }, + * 'interfaces': [ + * { + * id: int, + * name: str, + * description: str, + * connections: [ + * { + * network: int, , + * tagged: bool + * } + * ] + * } + * ] + * } + * + * network_mappings: { + * : + * } + */ + makeHost(hostInfo, network_mappings) { const value = JSON.stringify(hostInfo['value']); const interfaces = hostInfo['interfaces']; const width = 100; @@ -1022,6 +1175,15 @@ class NetworkStep { false ); port.getGeometry().offset = new mxPoint(-4*interfaces[i].name.length -2,0); + const iface = interfaces[i]; + for( const connection of iface.connections ) { + const network = this + .graph + .getModel() + .getCell(network_mappings[connection.network]); + + this.connectNetwork(port, network, connection.tagged); + } this.graph.refresh(port); } this.graph.refresh(host); diff --git a/src/templates/akraino/booking/booking_table.html b/src/templates/akraino/booking/booking_table.html new file mode 100644 index 0000000..4afb4d2 --- /dev/null +++ b/src/templates/akraino/booking/booking_table.html @@ -0,0 +1,41 @@ +{% load jira_filters %} + + + + + Owner + Purpose + Project + Start + End + Operating System + Pod + + + +{% for booking in bookings %} + + + {{ booking.owner.username }} + + + {{ booking.purpose }} + + + {{ booking.project }} + + + {{ booking.start }} + + + {{ booking.end }} + + + {{ booking.resource.get_head_node.config.image.os.name }} + + + {{ booking.resource.get_template_name }} + + +{% endfor %} + diff --git a/src/templates/akraino/booking/quick_deploy.html b/src/templates/akraino/booking/quick_deploy.html index 56a4791..80354d9 100644 --- a/src/templates/akraino/booking/quick_deploy.html +++ b/src/templates/akraino/booking/quick_deploy.html @@ -1,6 +1,14 @@ {% extends "base/booking/quick_deploy.html" %} {% block opnfv %} {% endblock opnfv %} +{% block form-text %} +

+ Please select a host type you wish to book. + Only available types are shown. + More information can be found here: + Akraino Wiki +

+{% endblock form-text %} {% block collab %}
diff --git a/src/templates/base/account/configuration_list.html b/src/templates/base/account/configuration_list.html index 206c203..fee6e83 100644 --- a/src/templates/base/account/configuration_list.html +++ b/src/templates/base/account/configuration_list.html @@ -41,6 +41,11 @@ var formData = ajaxForm.serialize(); req = new XMLHttpRequest(); var url = "delete/" + current_config_id; + req.onreadystatechange = function() { + if (this.readyState == 4 && this.status == 200) { + location.reload(); + } + }; req.open("POST", url, true); req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); req.onerror = function() { alert("problem submitting form"); } diff --git a/src/templates/base/account/resource_list.html b/src/templates/base/account/resource_list.html index 65b46f1..33ccaff 100644 --- a/src/templates/base/account/resource_list.html +++ b/src/templates/base/account/resource_list.html @@ -29,23 +29,20 @@ {% endfor %}