Changes FlavorSettings constructor to use kwargs.

And changed line lengths to 79 for pep8.

JIRA: SNAPS-95

Change-Id: Icd3ac79c66049b596c14273abb146d957d6e4e67
Signed-off-by: spisarski <s.pisarski@cablelabs.com>

1 files changed, 100 insertions, 54 deletions

diff --git a/snaps/openstack/tests/create_flavor_tests.py b/snaps/openstack/tests/create_flavor_tests.py
index be7ac64..5d7e4c4 100644
--- a/snaps/openstack/tests/create_flavor_tests.py
+++ b/snaps/openstack/tests/create_flavor_tests.py
@@ -12,8 +12,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import uuid
 import unittest
+import uuid
 
 from snaps.openstack.create_flavor import FlavorSettings, OpenStackFlavor
 from snaps.openstack.tests.os_source_file_test import OSComponentTestCase
@@ -61,107 +61,140 @@ class FlavorSettingsUnitTests(unittest.TestCase):
 
     def test_ram_string(self):
         with self.assertRaises(Exception):
-            FlavorSettings(name='foo', ram='bar', disk=2, vcpus=3, ephemeral=4, swap=5, rxtx_factor=6.0,
+            FlavorSettings(name='foo', ram='bar', disk=2, vcpus=3, ephemeral=4,
+                           swap=5, rxtx_factor=6.0,
                            is_public=False)
 
     def test_config_ram_string(self):
         with self.assertRaises(Exception):
-            FlavorSettings(config={'name': 'foo', 'ram': 'bar', 'disk': 2, 'vcpus': 3, 'ephemeral': 4, 'swap': 5,
-                                   'rxtx_factor': 6.0, 'is_public': False})
+            FlavorSettings(
+                config={'name': 'foo', 'ram': 'bar', 'disk': 2, 'vcpus': 3,
+                        'ephemeral': 4, 'swap': 5,
+                        'rxtx_factor': 6.0, 'is_public': False})
 
     def test_ram_float(self):
         with self.assertRaises(Exception):
-            FlavorSettings(name='foo', ram=1.5, disk=2, vcpus=3, ephemeral=4, swap=5, rxtx_factor=6.0, is_public=False)
+            FlavorSettings(name='foo', ram=1.5, disk=2, vcpus=3, ephemeral=4,
+                           swap=5, rxtx_factor=6.0, is_public=False)
 
     def test_config_ram_float(self):
         with self.assertRaises(Exception):
-            FlavorSettings(config={'name': 'foo', 'ram': 1.5, 'disk': 2, 'vcpus': 3, 'ephemeral': 4, 'swap': 5,
-                                   'rxtx_factor': 6.0, 'is_public': False})
+            FlavorSettings(
+                config={'name': 'foo', 'ram': 1.5, 'disk': 2, 'vcpus': 3,
+                        'ephemeral': 4, 'swap': 5,
+                        'rxtx_factor': 6.0, 'is_public': False})
 
     def test_disk_string(self):
         with self.assertRaises(Exception):
-            FlavorSettings(name='foo', ram=1, disk='bar', vcpus=3, ephemeral=4, swap=5, rxtx_factor=6.0,
+            FlavorSettings(name='foo', ram=1, disk='bar', vcpus=3, ephemeral=4,
+                           swap=5, rxtx_factor=6.0,
                            is_public=False)
 
     def test_config_disk_string(self):
         with self.assertRaises(Exception):
-            FlavorSettings(config={'name': 'foo', 'ram': 1, 'disk': 'bar', 'vcpus': 3, 'ephemeral': 4, 'swap': 5,
-                                   'rxtx_factor': 6.0, 'is_public': False})
+            FlavorSettings(
+                config={'name': 'foo', 'ram': 1, 'disk': 'bar', 'vcpus': 3,
+                        'ephemeral': 4, 'swap': 5,
+                        'rxtx_factor': 6.0, 'is_public': False})
 
     def test_disk_float(self):
         with self.assertRaises(Exception):
-            FlavorSettings(name='foo', ram=1, disk=2.5, vcpus=3, ephemeral=4, swap=5, rxtx_factor=6.0, is_public=False)
+            FlavorSettings(name='foo', ram=1, disk=2.5, vcpus=3, ephemeral=4,
+                           swap=5, rxtx_factor=6.0, is_public=False)
 
     def test_config_disk_float(self):
         with self.assertRaises(Exception):
-            FlavorSettings(config={'name': 'foo', 'ram': 1, 'disk': 2.5, 'vcpus': 3, 'ephemeral': 4, 'swap': 5,
-                                   'rxtx_factor': 6.0, 'is_public': False})
+            FlavorSettings(
+                config={'name': 'foo', 'ram': 1, 'disk': 2.5, 'vcpus': 3,
+                        'ephemeral': 4, 'swap': 5,
+                        'rxtx_factor': 6.0, 'is_public': False})
 
     def test_vcpus_string(self):
         with self.assertRaises(Exception):
-            FlavorSettings(name='foo', ram=1, disk=2, vcpus='bar', ephemeral=4, swap=5, rxtx_factor=6.0,
+            FlavorSettings(name='foo', ram=1, disk=2, vcpus='bar', ephemeral=4,
+                           swap=5, rxtx_factor=6.0,
                            is_public=False)
 
     def test_config_vcpus_string(self):
         with self.assertRaises(Exception):
-            FlavorSettings(config={'name': 'foo', 'ram': 1, 'disk': 2, 'vcpus': 'bar', 'ephemeral': 4, 'swap': 5,
-                                   'rxtx_factor': 6.0, 'is_public': False})
+            FlavorSettings(
+                config={'name': 'foo', 'ram': 1, 'disk': 2, 'vcpus': 'bar',
+                        'ephemeral': 4, 'swap': 5,
+                        'rxtx_factor': 6.0, 'is_public': False})
 
     def test_ephemeral_string(self):
         with self.assertRaises(Exception):
-            FlavorSettings(name='foo', ram=1, disk=2, vcpus=3, ephemeral='bar', swap=5, rxtx_factor=6.0,
+            FlavorSettings(name='foo', ram=1, disk=2, vcpus=3, ephemeral='bar',
+                           swap=5, rxtx_factor=6.0,
                            is_public=False)
 
     def test_config_ephemeral_string(self):
         with self.assertRaises(Exception):
-            FlavorSettings(config={'name': 'foo', 'ram': 1, 'disk': 2, 'vcpus': 3, 'ephemeral': 'bar', 'swap': 5,
-                                   'rxtx_factor': 6.0, 'is_public': False})
+            FlavorSettings(
+                config={'name': 'foo', 'ram': 1, 'disk': 2, 'vcpus': 3,
+                        'ephemeral': 'bar', 'swap': 5,
+                        'rxtx_factor': 6.0, 'is_public': False})
 
     def test_ephemeral_float(self):
         with self.assertRaises(Exception):
-            FlavorSettings(name='foo', ram=1, disk=2, vcpus=3, ephemeral=4.5, swap=5, rxtx_factor=6.0, is_public=False)
+            FlavorSettings(name='foo', ram=1, disk=2, vcpus=3, ephemeral=4.5,
+                           swap=5, rxtx_factor=6.0, is_public=False)
 
     def test_config_ephemeral_float(self):
         with self.assertRaises(Exception):
-            FlavorSettings(config={'name': 'foo', 'ram': 1, 'disk': 2, 'vcpus': 3, 'ephemeral': 4.5, 'swap': 5,
-                                   'rxtx_factor': 6.0, 'is_public': False})
+            FlavorSettings(
+                config={'name': 'foo', 'ram': 1, 'disk': 2, 'vcpus': 3,
+                        'ephemeral': 4.5, 'swap': 5,
+                        'rxtx_factor': 6.0, 'is_public': False})
 
     def test_swap_string(self):
         with self.assertRaises(Exception):
-            FlavorSettings(name='foo', ram=1, disk=2, vcpus=3, ephemeral=4, swap='bar', rxtx_factor=6.0,
+            FlavorSettings(name='foo', ram=1, disk=2, vcpus=3, ephemeral=4,
+                           swap='bar', rxtx_factor=6.0,
                            is_public=False)
 
     def test_config_swap_string(self):
         with self.assertRaises(Exception):
-            FlavorSettings(config={'name': 'foo', 'ram': 1, 'disk': 2, 'vcpus': 3, 'ephemeral': 4, 'swap': 'bar',
-                                   'rxtx_factor': 6.0, 'is_public': False})
+            FlavorSettings(
+                config={'name': 'foo', 'ram': 1, 'disk': 2, 'vcpus': 3,
+                        'ephemeral': 4, 'swap': 'bar',
+                        'rxtx_factor': 6.0, 'is_public': False})
 
     def test_swap_float(self):
         with self.assertRaises(Exception):
-            FlavorSettings(name='foo', ram=1, disk=2, vcpus=3, ephemeral=4, swap=5.5, rxtx_factor=6.0, is_public=False)
+            FlavorSettings(name='foo', ram=1, disk=2, vcpus=3, ephemeral=4,
+                           swap=5.5, rxtx_factor=6.0, is_public=False)
 
     def test_config_swap_float(self):
         with self.assertRaises(Exception):
-            FlavorSettings(config={'name': 'foo', 'ram': 1, 'disk': 2, 'vcpus': 3, 'ephemeral': 4, 'swap': 5.5,
-                                   'rxtx_factor': 6.0, 'is_public': False})
+            FlavorSettings(
+                config={'name': 'foo', 'ram': 1, 'disk': 2, 'vcpus': 3,
+                        'ephemeral': 4, 'swap': 5.5,
+                        'rxtx_factor': 6.0, 'is_public': False})
 
     def test_rxtx_string(self):
         with self.assertRaises(Exception):
-            FlavorSettings(name='foo', ram=1, disk=2, vcpus=3, ephemeral=4, swap=5, rxtx_factor='bar', is_public=False)
+            FlavorSettings(name='foo', ram=1, disk=2, vcpus=3, ephemeral=4,
+                           swap=5, rxtx_factor='bar', is_public=False)
 
     def test_config_rxtx_string(self):
         with self.assertRaises(Exception):
-            FlavorSettings(config={'name': 'foo', 'ram': 1, 'disk': 2, 'vcpus': 3, 'ephemeral': 4, 'swap': 5,
-                                   'rxtx_factor': 'bar', 'is_public': False})
+            FlavorSettings(
+                config={'name': 'foo', 'ram': 1, 'disk': 2, 'vcpus': 3,
+                        'ephemeral': 4, 'swap': 5,
+                        'rxtx_factor': 'bar', 'is_public': False})
 
     def test_is_pub_string(self):
         with self.assertRaises(Exception):
-            FlavorSettings(name='foo', ram=1, disk=2, vcpus=3, ephemeral=4, swap=5, rxtx_factor=6.0, is_public='bar')
+            FlavorSettings(name='foo', ram=1, disk=2, vcpus=3, ephemeral=4,
+                           swap=5, rxtx_factor=6.0, is_public='bar')
 
     def test_config_is_pub_string(self):
         with self.assertRaises(Exception):
-            FlavorSettings(config={'name': 'foo', 'ram': 1, 'disk': 2, 'vcpus': 3, 'ephemeral': 4, 'swap': 5,
-                                   'rxtx_factor': 6.0, 'is_public': 'bar'})
+            FlavorSettings(
+                config={'name': 'foo', 'ram': 1, 'disk': 2, 'vcpus': 3,
+                        'ephemeral': 4, 'swap': 5,
+                        'rxtx_factor': 6.0, 'is_public': 'bar'})
 
     def test_name_ram_disk_vcpus_only(self):
         settings = FlavorSettings(name='foo', ram=1, disk=2, vcpus=3)
@@ -177,7 +210,8 @@ class FlavorSettingsUnitTests(unittest.TestCase):
         self.assertEqual(None, settings.metadata)
 
     def test_config_with_name_ram_disk_vcpus_only(self):
-        settings = FlavorSettings(config={'name': 'foo', 'ram': 1, 'disk': 2, 'vcpus': 3})
+        settings = FlavorSettings(
+            **{'name': 'foo', 'ram': 1, 'disk': 2, 'vcpus': 3})
         self.assertEqual('foo', settings.name)
         self.assertEqual('auto', settings.flavor_id)
         self.assertEqual(1, settings.ram)
@@ -191,8 +225,9 @@ class FlavorSettingsUnitTests(unittest.TestCase):
 
     def test_all(self):
         metadata = {'foo': 'bar'}
-        settings = FlavorSettings(name='foo', flavor_id='bar', ram=1, disk=2, vcpus=3, ephemeral=4, swap=5,
-                                  rxtx_factor=6.0, is_public=False, metadata=metadata)
+        settings = FlavorSettings(
+            name='foo', flavor_id='bar', ram=1, disk=2, vcpus=3, ephemeral=4,
+            swap=5, rxtx_factor=6.0, is_public=False, metadata=metadata)
         self.assertEqual('foo', settings.name)
         self.assertEqual('bar', settings.flavor_id)
         self.assertEqual(1, settings.ram)
@@ -206,9 +241,12 @@ class FlavorSettingsUnitTests(unittest.TestCase):
 
     def test_config_all(self):
         metadata = {'foo': 'bar'}
-        settings = FlavorSettings(config={'name': 'foo', 'flavor_id': 'bar', 'ram': 1, 'disk': 2, 'vcpus': 3,
-                                          'ephemeral': 4, 'swap': 5, 'rxtx_factor': 6.0, 'is_public': False,
-                                          'metadata': metadata})
+        settings = FlavorSettings(
+            **{'name': 'foo', 'flavor_id': 'bar', 'ram': 1, 'disk': 2,
+               'vcpus': 3,
+               'ephemeral': 4, 'swap': 5, 'rxtx_factor': 6.0,
+               'is_public': False,
+               'metadata': metadata})
         self.assertEqual('foo', settings.name)
         self.assertEqual('bar', settings.flavor_id)
         self.assertEqual(1, settings.ram)
@@ -228,8 +266,8 @@ class CreateFlavorTests(OSComponentTestCase):
 
     def setUp(self):
         """
-        Instantiates the CreateSecurityGroup object that is responsible for downloading and creating an OS image file
-        within OpenStack
+        Instantiates the CreateSecurityGroup object that is responsible for
+        downloading and creating an OS image file within OpenStack
         """
         guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
         self.flavor_name = guid + 'name'
@@ -251,17 +289,20 @@ class CreateFlavorTests(OSComponentTestCase):
         Tests the creation of an OpenStack flavor.
         """
         # Create Flavor
-        flavor_settings = FlavorSettings(name=self.flavor_name, ram=1, disk=1, vcpus=1)
+        flavor_settings = FlavorSettings(name=self.flavor_name, ram=1, disk=1,
+                                         vcpus=1)
         self.flavor_creator = OpenStackFlavor(self.os_creds, flavor_settings)
         flavor = self.flavor_creator.create()
         self.assertTrue(validate_flavor(flavor_settings, flavor))
 
     def test_create_flavor_existing(self):
         """
-        Tests the creation of an OpenStack flavor then starts another creator to ensure it has not been done twice.
+        Tests the creation of an OpenStack flavor then starts another creator
+        to ensure it has not been done twice.
         """
         # Create Flavor
-        flavor_settings = FlavorSettings(name=self.flavor_name, ram=1, disk=1, vcpus=1)
+        flavor_settings = FlavorSettings(name=self.flavor_name, ram=1, disk=1,
+                                         vcpus=1)
         self.flavor_creator = OpenStackFlavor(self.os_creds, flavor_settings)
         flavor = self.flavor_creator.create()
         self.assertTrue(validate_flavor(flavor_settings, flavor))
@@ -276,7 +317,8 @@ class CreateFlavorTests(OSComponentTestCase):
         Tests the creation and cleanup of an OpenStack flavor.
         """
         # Create Flavor
-        flavor_settings = FlavorSettings(name=self.flavor_name, ram=1, disk=1, vcpus=1)
+        flavor_settings = FlavorSettings(name=self.flavor_name, ram=1, disk=1,
+                                         vcpus=1)
         self.flavor_creator = OpenStackFlavor(self.os_creds, flavor_settings)
         flavor = self.flavor_creator.create()
         self.assertTrue(validate_flavor(flavor_settings, flavor))
@@ -285,22 +327,26 @@ class CreateFlavorTests(OSComponentTestCase):
         self.flavor_creator.clean()
 
         self.assertIsNone(self.flavor_creator.get_flavor())
-        self.assertIsNone(nova_utils.get_flavor_by_name(self.nova, flavor_settings.name))
+        self.assertIsNone(
+            nova_utils.get_flavor_by_name(self.nova, flavor_settings.name))
 
     def test_create_delete_flavor(self):
         """
-        Tests the creation of an OpenStack Security Group, the deletion, then cleanup to ensure clean() does not
+        Tests the creation of an OpenStack Security Group, the deletion, then
+        cleanup to ensure clean() does not
         raise any exceptions.
         """
         # Create Flavor
-        flavor_settings = FlavorSettings(name=self.flavor_name, ram=1, disk=1, vcpus=1)
+        flavor_settings = FlavorSettings(name=self.flavor_name, ram=1, disk=1,
+                                         vcpus=1)
         self.flavor_creator = OpenStackFlavor(self.os_creds, flavor_settings)
         flavor = self.flavor_creator.create()
         self.assertTrue(validate_flavor(flavor_settings, flavor))
 
         # Delete Flavor
         nova_utils.delete_flavor(self.nova, flavor)
-        self.assertIsNone(nova_utils.get_flavor_by_name(self.nova, flavor_settings.name))
+        self.assertIsNone(
+            nova_utils.get_flavor_by_name(self.nova, flavor_settings.name))
 
         # Attempt to cleanup
         self.flavor_creator.clean()
@@ -317,7 +363,7 @@ def validate_flavor(flavor_settings, flavor):
     :param flavor: the OpenStack flavor object
     """
     return flavor is not None \
-           and flavor_settings.name == flavor.name \
-           and flavor_settings.ram == flavor.ram \
-           and flavor_settings.disk == flavor.disk \
-           and flavor_settings.vcpus == flavor.vcpus
+        and flavor_settings.name == flavor.name \
+        and flavor_settings.ram == flavor.ram \
+        and flavor_settings.disk == flavor.disk \
+        and flavor_settings.vcpus == flavor.vcpus