From b7c4d286ffa618be0e95b15f3883e2f6920a3fb1 Mon Sep 17 00:00:00 2001 From: Parker Berberian Date: Tue, 20 Nov 2018 11:19:55 -0500 Subject: Fix all flake8 errors The flake8 command in test.sh finds no longer finds any errors. This may form a basis of a jenkins verify job as a sort of 'weak compile-time checks' The flake8 command will not complain about line length, and will not complain about django's manage.py file Change-Id: Ic47cb4fc7ada55e64485661ab6881aef475018ff Signed-off-by: Parker Berberian --- src/workflow/sw_bundle_workflow.py | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) (limited to 'src/workflow/sw_bundle_workflow.py') diff --git a/src/workflow/sw_bundle_workflow.py b/src/workflow/sw_bundle_workflow.py index 0e9be95..56d0a5d 100644 --- a/src/workflow/sw_bundle_workflow.py +++ b/src/workflow/sw_bundle_workflow.py @@ -8,18 +8,15 @@ ############################################################################## -from django.forms import formset_factory, modelformset_factory +from django.forms import formset_factory from workflow.models import WorkflowStep from workflow.forms import SoftwareConfigurationForm, HostSoftwareDefinitionForm from workflow.booking_workflow import Resource_Select -from resource_inventory.models import * +from resource_inventory.models import Image, GenericHost, ConfigBundle, HostConfiguration, Installer, OPNFVConfig -#resource selection step is reused from Booking workflow - -#TODO: change this: too hacky, just for presentation - +# resource selection step is reused from Booking workflow class SWConf_Resource_Select(Resource_Select): def __init__(self, *args, **kwargs): super(SWConf_Resource_Select, self).__init__(*args, **kwargs) @@ -42,6 +39,7 @@ class SWConf_Resource_Select(Resource_Select): self.repo_put(self.repo.CONFIG_MODELS, models) return response + class Define_Software(WorkflowStep): template = 'config_bundle/steps/define_software.html' title = "Pick Software" @@ -69,7 +67,7 @@ class Define_Software(WorkflowStep): filter_data = {} user = self.repo_get(self.repo.SESSION_USER) - i=0; + i = 0 for host_data in hosts_initial: host = GenericHost.objects.get(pk=host_data['host_id']) excluded_images = Image.objects.exclude(owner=user).exclude(public=True) @@ -143,10 +141,10 @@ class Define_Software(WorkflowStep): role = form.cleaned_data['role'] bundle = models['bundle'] hostConfig = HostConfiguration( - host=host, - image=image, - bundle=bundle, - opnfvRole=role + host=host, + image=image, + bundle=bundle, + opnfvRole=role ) models['host_configs'].append(hostConfig) confirm_host = {"name": host.resource.name, "image": image.name, "role": role.name} @@ -163,10 +161,11 @@ class Define_Software(WorkflowStep): return self.render(request) + class Config_Software(WorkflowStep): template = 'config_bundle/steps/config_software.html' form = SoftwareConfigurationForm - context = {'workspace_form':form} + context = {'workspace_form': form} title = "Other Info" description = "Give your software config a name, description, and other stuff" short_title = "config info" @@ -203,7 +202,6 @@ class Config_Software(WorkflowStep): if "bundle" not in models: models['bundle'] = ConfigBundle(owner=self.repo_get(self.repo.SESSION_USER)) - confirm = self.repo_get(self.repo.CONFIRMATION, {}) if "configuration" not in confirm: confirm['configuration'] = {} @@ -216,10 +214,10 @@ class Config_Software(WorkflowStep): installer = form.cleaned_data['installer'] scenario = form.cleaned_data['scenario'] opnfv = OPNFVConfig( - bundle=models['bundle'], - installer=installer, - scenario=scenario - ) + bundle=models['bundle'], + installer=installer, + scenario=scenario + ) models['opnfv'] = opnfv confirm['configuration']['installer'] = form.cleaned_data['installer'].name confirm['configuration']['scenario'] = form.cleaned_data['scenario'].name @@ -233,6 +231,6 @@ class Config_Software(WorkflowStep): self.repo_put(self.repo.CONFIG_MODELS, models) self.repo_put(self.repo.CONFIRMATION, confirm) - except Exception as e: + except Exception: pass return self.render(request) -- cgit 1.2.3-korg