diff options
author | Parker Berberian <pberberian@iol.unh.edu> | 2018-11-20 11:19:55 -0500 |
---|---|---|
committer | Parker Berberian <pberberian@iol.unh.edu> | 2018-11-26 14:07:15 -0500 |
commit | b7c4d286ffa618be0e95b15f3883e2f6920a3fb1 (patch) | |
tree | 930e9b9282b8f50e671844b2a1e7f39dc5d6035d /src/resource_inventory/tests | |
parent | 6a90796de1df8d74c79415c39c867ffe6cd80fd0 (diff) |
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 <pberberian@iol.unh.edu>
Diffstat (limited to 'src/resource_inventory/tests')
-rw-r--r-- | src/resource_inventory/tests/test_managers.py | 49 | ||||
-rw-r--r-- | src/resource_inventory/tests/test_models.py | 109 |
2 files changed, 91 insertions, 67 deletions
diff --git a/src/resource_inventory/tests/test_managers.py b/src/resource_inventory/tests/test_managers.py index 5a13b2e..0e7c673 100644 --- a/src/resource_inventory/tests/test_managers.py +++ b/src/resource_inventory/tests/test_managers.py @@ -12,7 +12,20 @@ from django.contrib.auth.models import User from resource.inventory_manager import InventoryManager from resource.resource_manager import ResourceManager -from resource.models import * +from account.models import Lab +from resource.models import ( + Host, + Vlan, + Interface, + ResourceBundle, + GenericHost, + GenericResourceBundle, + CpuProfile, + RamProfile, + DiskProfile, + HostProfile, + InterfaceProfile +) class InventoryManagerTestCase(TestCase): @@ -39,30 +52,30 @@ class InventoryManagerTestCase(TestCase): name='Test profile', description='a test profile' ) - interfaceProfile = InterfaceProfile.objects.create( + InterfaceProfile.objects.create( speed=1000, name='eno3', host=hostProfile ) - diskProfile = DiskProfile.objects.create( + DiskProfile.objects.create( size=1000, media_type="SSD", name='/dev/sda', host=hostProfile ) - cpuProfile = CpuProfile.objects.create( + CpuProfile.objects.create( cores=96, architecture="x86_64", cpus=2, host=hostProfile ) - ramProfile = RamProfile.objects.create( + RamProfile.objects.create( amount=256, channels=4, host=hostProfile ) - #create GenericResourceBundle + # create GenericResourceBundle genericBundle = GenericResourceBundle.objects.create() self.gHost1 = GenericHost.objects.create( @@ -76,7 +89,7 @@ class InventoryManagerTestCase(TestCase): profile=hostProfile ) - #actual resource bundle + # actual resource bundle bundle = ResourceBundle.objects.create(template=genericBundle) self.host1 = Host.objects.create( @@ -100,7 +113,7 @@ class InventoryManagerTestCase(TestCase): vlan1 = Vlan.objects.create(vlan_id=300, tagged=False) vlan2 = Vlan.objects.create(vlan_id=300, tagged=False) - iface1 = Interface.objects.create( + Interface.objects.create( mac_address='00:11:22:33:44:55', bus_address='some bus address', switch_name='switch1', @@ -108,7 +121,7 @@ class InventoryManagerTestCase(TestCase): config=vlan1, host=self.host1 ) - iface2 = Interface.objects.create( + Interface.objects.create( mac_address='00:11:22:33:44:56', bus_address='some bus address', switch_name='switch1', @@ -153,30 +166,30 @@ class ResourceManagerTestCase(TestCase): name='Test profile', description='a test profile' ) - interfaceProfile = InterfaceProfile.objects.create( + InterfaceProfile.objects.create( speed=1000, name='eno3', host=hostProfile ) - diskProfile = DiskProfile.objects.create( + DiskProfile.objects.create( size=1000, media_type="SSD", name='/dev/sda', host=hostProfile ) - cpuProfile = CpuProfile.objects.create( + CpuProfile.objects.create( cores=96, architecture="x86_64", cpus=2, host=hostProfile ) - ramProfile = RamProfile.objects.create( + RamProfile.objects.create( amount=256, channels=4, host=hostProfile ) - #create GenericResourceBundle + # create GenericResourceBundle genericBundle = GenericResourceBundle.objects.create() self.gHost1 = GenericHost.objects.create( @@ -190,7 +203,7 @@ class ResourceManagerTestCase(TestCase): profile=hostProfile ) - #actual resource bundle + # actual resource bundle bundle = ResourceBundle.objects.create(template=genericBundle) self.host1 = Host.objects.create( @@ -214,7 +227,7 @@ class ResourceManagerTestCase(TestCase): vlan1 = Vlan.objects.create(vlan_id=300, tagged=False) vlan2 = Vlan.objects.create(vlan_id=300, tagged=False) - iface1 = Interface.objects.create( + Interface.objects.create( mac_address='00:11:22:33:44:55', bus_address='some bus address', switch_name='switch1', @@ -222,7 +235,7 @@ class ResourceManagerTestCase(TestCase): config=vlan1, host=self.host1 ) - iface2 = Interface.objects.create( + Interface.objects.create( mac_address='00:11:22:33:44:56', bus_address='some bus address', switch_name='switch1', @@ -232,5 +245,5 @@ class ResourceManagerTestCase(TestCase): ) def test_convert_bundle(self): - bundle = ResourceManager.getInstance().convertResoureBundle(self.genericBundle, self.lab.name) + ResourceManager.getInstance().convertResoureBundle(self.genericBundle, self.lab.name) # verify bundle configuration diff --git a/src/resource_inventory/tests/test_models.py b/src/resource_inventory/tests/test_models.py index 4ddedf2..e1b2106 100644 --- a/src/resource_inventory/tests/test_models.py +++ b/src/resource_inventory/tests/test_models.py @@ -9,11 +9,24 @@ from django.test import TestCase from django.contrib.auth.models import User from account.models import Lab -from resource_inventory.models import * +from resource_inventory.models import ( + Scenario, + Installer, + Opsys, + ConfigBundle, + OPNFVConfig, + OPNFVRole, + Image, + HostProfile, + GenericResourceBundle, + GenericResource, + GenericHost, + HostConfiguration +) class ConfigUtil(): - count=0 + count = 0 @staticmethod def makeScenario(): @@ -21,17 +34,13 @@ class ConfigUtil(): @staticmethod def makeInstaller(): - inst = Installer.objects.create( - name = "testInstaller" - ) + inst = Installer.objects.create(name="testInstaller") inst.sup_scenarios = [ConfigUtil.makeScenario()] return inst @staticmethod def makeOpsys(): - os = Opsys.objects.create( - name = "test Operating System" - ) + os = Opsys.objects.create(name="test Operating System") os.sup_installers = [ConfigUtil.makeInstaller()] return os @@ -39,9 +48,7 @@ class ConfigUtil(): def makeConfigBundle(): user = User.objects.create(username="test_user" + str(ConfigUtil.count)) ConfigUtil.count += 1 - return ConfigBundle.objects.create( - owner = user - ) + return ConfigBundle.objects.create(owner=user) @staticmethod def makeOPNFVConfig(): @@ -49,61 +56,60 @@ class ConfigUtil(): scenario = ConfigUtil.makeScenario() bundle = ConfigUtil.makeConfigBundle() return OPNFVConfig.objects.create( - installer=installer, - scenario=scenario, - bundle=bundle - ) + installer=installer, + scenario=scenario, + bundle=bundle + ) @staticmethod def makeOPNFVRole(): return OPNFVRole.objects.create( - name="Test role", - description="This is a test role" - ) + name="Test role", + description="This is a test role" + ) @staticmethod def makeImage(): owner = User.objects.create(username="another test user") lab_user = User.objects.create(username="labUserForTests") lab = Lab.objects.create( - lab_user=lab_user, - name="this is lab for testing", - contact_email="email@mail.com", - contact_phone="123-4567" - ) + lab_user=lab_user, + name="this is lab for testing", + contact_email="email@mail.com", + contact_phone="123-4567" + ) return Image.objects.create( - lab_id=0, - from_lab=lab, - name="an image for testing", - owner=owner - ) - + lab_id=0, + from_lab=lab, + name="an image for testing", + owner=owner + ) @staticmethod def makeGenericHost(): profile = HostProfile.objects.create( - host_type=0, - name="test lab for config bundle", - description="this is a test profile" - ) + host_type=0, + name="test lab for config bundle", + description="this is a test profile" + ) user = User.objects.create(username="test sample user 12") bundle = GenericResourceBundle.objects.create( - name="Generic bundle for config tests", - xml="", - owner=user, - description="" - ) + name="Generic bundle for config tests", + xml="", + owner=user, + description="" + ) resource = GenericResource.objects.create( - bundle=bundle, - name="a test generic resource" - ) + bundle=bundle, + name="a test generic resource" + ) return GenericHost.objects.create( - profile=profile, - resource=resource - ) + profile=profile, + resource=resource + ) @staticmethod def makeHostConfiguration(): @@ -112,11 +118,11 @@ class ConfigUtil(): bundle = ConfigUtil.makeConfigBundle() opnfvRole = ConfigUtil.makeOPNFVRole() return HostConfiguration.objects.create( - host=host, - image=image, - bundle=bundle, - opnfvRole=opnfvRole - ) + host=host, + image=image, + bundle=bundle, + opnfvRole=opnfvRole + ) class ScenarioTestCase(TestCase): @@ -124,26 +130,31 @@ class ScenarioTestCase(TestCase): def test_save(self): self.assertTrue(ConfigUtil.makeScenario()) + class InstallerTestCase(TestCase): def test_save(self): self.assertTrue(ConfigUtil.makeInstaller()) + class OperatingSystemTestCase(TestCase): def test_save(self): self.assertTrue(ConfigUtil.makeOpsys()) + class ConfigBundleTestCase(TestCase): def test_save(self): self.assertTrue(ConfigUtil.makeConfigBundle()) + class OPNFVConfigTestCase(TestCase): def test_save(self): self.assertTrue(ConfigUtil.makeOPNFVConfig()) + class OPNFVRoleTestCase(TestCase): def test_save(self): |