Merge pull request #98 from SUSE-Enceladus/tests_strategy_improvement_changes

Includes the required changes to include the test_regions field in ec2 accounts

Author: smarlowucf

mash_client/cli/account/ec2.py

@@ -31,7 +31,8 @@
     abort_if_false,
     echo_dict,
     echo_style,
-    additional_regions_repl
+    additional_regions_repl,
+    test_regions_repl
 )
 
 
@@ -43,6 +44,12 @@ def ec2():
 
 
 @click.command()
+@click.option(
+    '--test-regions',
+    is_flag=True,
+    help='Invoke test region addition process to specify information '
+         'for test regions'
+)
 @click.option(
     '--additional-regions',
     is_flag=True,
@@ -92,7 +99,7 @@ def ec2():
 )
 @click.pass_context
 def add(
-    context, additional_regions, group, name, partition,
+    context, test_regions, additional_regions, group, name, partition,
     region, subnet, access_key_id, secret_access_key
 ):
     """
@@ -114,6 +121,9 @@ def add(
         if additional_regions:
             data['additional_regions'] = additional_regions_repl()
 
+        if test_regions:
+            data['test_regions'] = test_regions_repl()
+
         if group:
             data['group'] = group
 
@@ -206,6 +216,12 @@ def delete(context, name):
 
 
 @click.command()
+@click.option(
+    '--test-regions',
+    is_flag=True,
+    help='Invoke region addition process to specify information '
+         'for test regions'
+)
 @click.option(
     '--additional-regions',
     is_flag=True,
@@ -245,7 +261,7 @@ def delete(context, name):
 )
 @click.pass_context
 def update(
-    context, additional_regions, group, name,
+    context, test_regions, additional_regions, group, name,
     region, subnet, access_key_id, secret_access_key
 ):
     """
@@ -276,6 +292,12 @@ def update(
             if regions:
                 data['additional_regions'] = regions
 
+        if test_regions:
+            regions = test_regions_repl()
+
+            if regions:
+                data['test_regions'] = regions
+
         if group:
             data['group'] = group
 

mash_client/cli_utils.py

@@ -346,6 +346,27 @@ def additional_regions_repl():
     return regions
 
 
+def test_regions_repl():
+    regions = []
+
+    while True:
+        if click.confirm('Add a test region?'):
+            name = click.prompt('Enter the region name', type=str)
+            subnet = click.prompt(
+                'Enter the subnet id',
+                type=str
+            )
+
+            regions.append({
+                'region': name,
+                'subnet': subnet
+            })
+        else:
+            break
+
+    return regions
+
+
 def get_free_port(ports):
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)

tests/test_ec2_account.py

@@ -21,7 +21,11 @@ def test_account_add_ec2(mock_requests, mock_time):
             'id': '1',
             'name': 'us-east-5',
             'helper_image': 'ami-12345'
-        }
+        },
+        'test_regions': [{
+            'region': 'us-east-6',
+            'subnet': 'subnet-123456'
+        }]
     }
     mock_requests.post.return_value = response
     mock_time.time.return_value = 1568150470
@@ -31,14 +35,19 @@ def test_account_add_ec2(mock_requests, mock_time):
         main,
         [
             '-C', 'tests/data/', 'account', 'ec2', 'add',
-            '--additional-regions', '--name', 'acnt1', '--partition', 'aws',
+            '--additional-regions', '--test-regions', '--name', 'acnt1',
+            '--partition', 'aws',
             '--region', 'us-east-1', '--subnet',
             'subnet-123456789', '--access-key-id', '123456',
             '--secret-access-key', '654321'
         ],
         input='y\n'
               'us-east-5\n'
               'ami-12345\n'
+              'n\n'
+              'y\n'
+              'us-east-6\n'
+              'subnet-123456\n'
               'n'
     )
     assert result.exit_code == 0
@@ -83,7 +92,13 @@ def test_ec2_account_info(mock_requests, mock_time):
             'id': '1',
             'name': 'us-east-5',
             'helper_image': 'ami-12345'
-        }
+        },
+        'test_regions': [
+            {
+                'region': 'us-east-6',
+                'subnet': 'subnet-123456'
+            }
+        ]
     }
     mock_requests.get.return_value = response
     mock_time.time.return_value = 1568150470
@@ -147,7 +162,11 @@ def test_account_update_ec2(mock_requests, mock_time):
             'id': '1',
             'name': 'us-east-5',
             'helper_image': 'ami-12345'
-        }
+        },
+        'test_regions': [{
+            'region': 'us-east-6',
+            'subnet': 'subnet-123456'
+        }]
     }
     mock_requests.post.return_value = response
     mock_time.time.return_value = 1568150470
@@ -157,14 +176,18 @@ def test_account_update_ec2(mock_requests, mock_time):
         main,
         [
             '-C', 'tests/data/', 'account', 'ec2', 'update',
-            '--additional-regions', '--name', 'acnt1',
+            '--additional-regions', '--test-regions', '--name', 'acnt1',
             '--region', 'us-east-1', '--subnet',
             'subnet-123456789', '--access-key-id', '123456',
             '--secret-access-key', '654321'
         ],
         input='y\n'
               'us-east-5\n'
               'ami-12345\n'
+              'n\n'
+              'y\n'
+              'us-east-6\n'
+              'subnet-123456\n'
               'n'
     )
     assert result.exit_code == 0