Default to True for existing and update assess scripts.

sdg0919 · Jan 25, 2018 · 22c9be7 · 22c9be7
1 parent ca21cce
commit 22c9be7
Show file tree

Hide file tree

Showing 23 changed files with 34 additions and 27 deletions.
diff --git a/acceptancetests/assess_add_credentials.py b/acceptancetests/assess_add_credentials.py
@@ -288,7 +288,7 @@ def parse_args(argv):
     parser = argparse.ArgumentParser(
         description='Test if juju properly adds credentials with the '
         'add-credential command.')
-    add_basic_testing_arguments(parser)
+    add_basic_testing_arguments(parser, existing=False)
     return parser.parse_args(argv)
 
 

diff --git a/acceptancetests/assess_agent_metadata.py b/acceptancetests/assess_agent_metadata.py
@@ -379,7 +379,7 @@ def parse_args(argv):
     parser = ArgumentParser(
         description="Test bootstrap for agent-metdadata-url")
 
-    add_basic_testing_arguments(parser)
+    add_basic_testing_arguments(parser, existing=False)
 
     parser.add_argument('--agent-file', required=True, action='store',
                         help='agent file to be used during bootstrap.')

diff --git a/acceptancetests/assess_autoload_credentials.py b/acceptancetests/assess_autoload_credentials.py
@@ -626,7 +626,7 @@ def parse_args(argv):
     """Parse all arguments."""
     parser = argparse.ArgumentParser(
         description="Test autoload-credentials command.")
-    add_basic_testing_arguments(parser)
+    add_basic_testing_arguments(parser, existing=False)
     return parser.parse_args(argv)
 
 

diff --git a/acceptancetests/assess_budget.py b/acceptancetests/assess_budget.py
@@ -244,7 +244,9 @@ def assess_show_budget(client, budget_name, budget_value):
 def parse_args(argv):
     """Parse all arguments."""
     parser = argparse.ArgumentParser(description="Test budget commands")
-    add_basic_testing_arguments(parser)
+    # Set to false it it's possible to overwrite actual cookie data if someone
+    # runs it against an existing environment
+    add_basic_testing_arguments(parser, existing=False)
     return parser.parse_args(argv)
 
 

diff --git a/acceptancetests/assess_cloud.py b/acceptancetests/assess_cloud.py
@@ -124,7 +124,7 @@ def parse_args(args):
         subparser.add_argument('clouds_file',
                                help='A clouds.yaml file to use for testing.')
         subparser.add_argument('cloud', help='Specific cloud to test.')
-        add_basic_testing_arguments(subparser, env=False)
+        add_basic_testing_arguments(subparser, env=False, existing=False)
         subparser.add_argument('--config')
         if test == 'provisioning':
             subparser.add_argument('--machine-series', action='append',

diff --git a/acceptancetests/assess_container_networking.py b/acceptancetests/assess_container_networking.py
@@ -50,9 +50,9 @@ def parse_args(argv=None):
     case of failure pull logs and configuration files from the machine that
     we detected a problem on for later analysis.
     """)
-    parser = add_basic_testing_arguments(ArgumentParser(
-        description=description
-    ))
+    parser = add_basic_testing_arguments(
+        ArgumentParser(description=description),
+        existing=False)
     parser.add_argument(
         '--machine-type',
         help='Which virtual machine/container type to test. Defaults to all.',

diff --git a/acceptancetests/assess_destroy_model.py b/acceptancetests/assess_destroy_model.py
@@ -147,7 +147,7 @@ def parse_args(argv):
     parser = argparse.ArgumentParser(
         description='Test if juju drops selection of the current model '
         'when that model is destroyed.')
-    add_basic_testing_arguments(parser)
+    add_basic_testing_arguments(parser, existing=False)
     return parser.parse_args(argv)
 
 

diff --git a/acceptancetests/assess_endpoint_bindings.py b/acceptancetests/assess_endpoint_bindings.py
@@ -350,7 +350,7 @@ def assess_endpoint_bindings(maas_manager, bootstrap_manager):
 def parse_args(argv):
     """Parse all arguments."""
     parser = argparse.ArgumentParser(description="assess endpoint bindings")
-    add_basic_testing_arguments(parser)
+    add_basic_testing_arguments(parser, existing=False)
     args = parser.parse_args(argv)
     if args.upload_tools:
         parser.error("giving --upload-tools meaningless on 2.0 only test")

diff --git a/acceptancetests/assess_juju_sync_tools.py b/acceptancetests/assess_juju_sync_tools.py
@@ -85,7 +85,7 @@ def parse_args(argv):
 
     parser = argparse.ArgumentParser(
         description="Testing sync tools operates correctly")
-    add_basic_testing_arguments(parser)
+    add_basic_testing_arguments(parser, existing=False)
     return parser.parse_args(argv)
 
 

diff --git a/acceptancetests/assess_log_forward.py b/acceptancetests/assess_log_forward.py
@@ -289,7 +289,8 @@ def parse_args(argv):
     """Parse all arguments."""
     parser = argparse.ArgumentParser(
         description="Test log forwarding of logs.")
-    add_basic_testing_arguments(parser)
+    # Don't use existing as this test modifies controller settings.
+    add_basic_testing_arguments(parser, existing=False)
     return parser.parse_args(argv)
 
 

diff --git a/acceptancetests/assess_log_rotation.py b/acceptancetests/assess_log_rotation.py
@@ -198,7 +198,9 @@ def check_log0(expected, action_output):
 def parse_args(argv=None):
     """Parse all arguments."""
     parser = add_basic_testing_arguments(
-        ArgumentParser(description='Test log rotation.'), deadline=False)
+        ArgumentParser(description='Test log rotation.'),
+        existing=False,
+        deadline=False)
     parser.add_argument(
         'agent',
         help='Which agent log rotation to test.',

diff --git a/acceptancetests/assess_model_config_tree.py b/acceptancetests/assess_model_config_tree.py
@@ -88,7 +88,8 @@ def set_clouds_yaml_config(client, config_details):
 def parse_args(argv):
     """Parse all arguments."""
     parser = argparse.ArgumentParser(description="Test Model Tree Config")
-    add_basic_testing_arguments(parser)
+    # Modifies controller config, can't using existing safely.
+    add_basic_testing_arguments(parser, existing=False)
     return parser.parse_args(argv)
 
 

diff --git a/acceptancetests/assess_model_migration.py b/acceptancetests/assess_model_migration.py
@@ -109,7 +109,7 @@ def parse_args(argv):
     """Parse all arguments."""
     parser = argparse.ArgumentParser(
         description="Test model migration feature")
-    add_basic_testing_arguments(parser)
+    add_basic_testing_arguments(parser, existing=False)
     parser.add_argument(
         '--use-develop',
         action='store_true',

diff --git a/acceptancetests/assess_model_migration_versions.py b/acceptancetests/assess_model_migration_versions.py
@@ -172,7 +172,7 @@ def assert_stable_juju_suitable_for_testing(stable_bsm, devel_bsm):
 def parse_args(argv):
     parser = argparse.ArgumentParser(
         description='Test model migration between versioned controllers.')
-    add_basic_testing_arguments(parser)
+    add_basic_testing_arguments(parser, existing=False)
     parser.add_argument(
         '--stable-juju-bin',
         help='Path to juju binary to be used as the stable version of juju.')

diff --git a/acceptancetests/assess_multimodel.py b/acceptancetests/assess_multimodel.py
@@ -115,7 +115,8 @@ def check_services(client):
 def parse_args(argv=None):
     """Parse all arguments."""
     parser = ArgumentParser()
-    add_basic_testing_arguments(parser, using_jes=True, deadline=True)
+    add_basic_testing_arguments(
+        parser, using_jes=True, deadline=True, existing=False)
     return parser.parse_args(argv)
 
 

diff --git a/acceptancetests/assess_network_health.py b/acceptancetests/assess_network_health.py
@@ -560,7 +560,7 @@ def _setup_spaces(bundle, existing_spaces):
 def parse_args(argv):
     """Parse all arguments."""
     parser = argparse.ArgumentParser(description="Test Network Health")
-    add_basic_testing_arguments(parser)
+    add_basic_testing_arguments(parser, existing=False)
     parser.add_argument('--bundle', help='Bundle to test network against')
     parser.add_argument('--model', help='Existing Juju model to test against')
     parser.add_argument('--reboot', type=bool,

diff --git a/acceptancetests/assess_recovery.py b/acceptancetests/assess_recovery.py
@@ -188,7 +188,7 @@ def restore_missing_state_server(bs_manager, controller_client, backup_file,
 
 def parse_args(argv=None):
     parser = ArgumentParser(description='Test recovery strategies.')
-    add_basic_testing_arguments(parser)
+    add_basic_testing_arguments(parser, existing=False)
     parser.add_argument(
         '--charm-series', help='Charm series.', default='')
     strategy = parser.add_argument_group('test strategy')

diff --git a/acceptancetests/assess_spaces_subnets.py b/acceptancetests/assess_spaces_subnets.py
@@ -31,9 +31,9 @@ def parse_args(argv=None):
     case of failure pull logs and configuration files from the machine that
     we detected a problem on for later analysis.
     """)
-    parser = add_basic_testing_arguments(ArgumentParser(
-        description=description
-    ))
+    parser = add_basic_testing_arguments(
+        ArgumentParser(description=description),
+        existing=False)
     parser.add_argument(
         '--clean-environment', action='store_true', help=dedent("""\
         Attempts to re-use an existing environment rather than destroying it

diff --git a/acceptancetests/assess_unregister.py b/acceptancetests/assess_unregister.py
@@ -104,7 +104,7 @@ def assert_controller_list(client, controller_list):
 
 def parse_args(argv):
     parser = argparse.ArgumentParser(description="Test unregister feature.")
-    add_basic_testing_arguments(parser)
+    add_basic_testing_arguments(parser, existing=False)
     return parser.parse_args(argv)
 
 

diff --git a/acceptancetests/assess_user_grant_revoke.py b/acceptancetests/assess_user_grant_revoke.py
@@ -375,7 +375,7 @@ def parse_args(argv):
     """Parse all arguments."""
     parser = argparse.ArgumentParser(
         description="Test grant and revoke permissions for users")
-    add_basic_testing_arguments(parser)
+    add_basic_testing_arguments(parser, existing=False)
     return parser.parse_args(argv)
 
 

diff --git a/acceptancetests/deploy_stack.py b/acceptancetests/deploy_stack.py
@@ -424,7 +424,7 @@ def upgrade_juju(client):
 
 def deploy_job_parse_args(argv=None):
     parser = ArgumentParser('deploy_job')
-    add_basic_testing_arguments(parser)
+    add_basic_testing_arguments(parser, existing=False)
     parser.add_argument('--upgrade', action="store_true", default=False,
                         help='Perform an upgrade test.')
     parser.add_argument(

diff --git a/acceptancetests/run_deployer.py b/acceptancetests/run_deployer.py
@@ -33,7 +33,7 @@ def parse_args(argv=None):
                         help='Perform an upgrade test.')
     parser.add_argument('bundle_path',
                         help='URL or path to a bundle')
-    add_basic_testing_arguments(parser)
+    add_basic_testing_arguments(parser, existing=False)
     parser.add_argument('--allow-native-deploy', action='store_true',
                         help='Let juju 2 use native bundle deploying.')
     parser.add_argument('--bundle-verification-script',

diff --git a/acceptancetests/utility.py b/acceptancetests/utility.py
@@ -222,7 +222,7 @@ def add_arg_juju_bin(parser):
 
 
 def add_basic_testing_arguments(
-        parser, using_jes=False, deadline=True, env=True, existing=False):
+        parser, using_jes=False, deadline=True, env=True, existing=True):
     """Returns the parser loaded with basic testing arguments.
 
     The basic testing arguments, used in conjuction with boot_context ensures