From 00c01aeafab54ec7b9ea376099fb6aaff0da5f5a Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 19 Dec 2017 19:58:15 +0100
Subject: Remove openstack_[clean,snapshot]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It also removes the related unit tests and updates docs and cli.

Change-Id: Ie11f77402f2b5b7055a0c7c5d931c8ff21124482
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 functest/cli/cli_base.py        | 17 ----------------
 functest/cli/commands/cli_os.py | 43 -----------------------------------------
 2 files changed, 60 deletions(-)

(limited to 'functest/cli')

diff --git a/functest/cli/cli_base.py b/functest/cli/cli_base.py
index aa8ab24b..5890e0a3 100644
--- a/functest/cli/cli_base.py
+++ b/functest/cli/cli_base.py
@@ -64,23 +64,6 @@ def os_check():
     _openstack.check()
 
 
-@openstack.command('snapshot-create', help="Generates a snapshot of the "
-                   "current OpenStack resources.")
-def os_snapshot_create():
-    _openstack.snapshot_create()
-
-
-@openstack.command('snapshot-show', help="Prints the OpenStack snapshot.")
-def os_snapshot_show():
-    _openstack.snapshot_show()
-
-
-@openstack.command('clean',
-                   help="Cleans the OpenStack resources except the snapshot.")
-def os_clean():
-    _openstack.clean()
-
-
 @openstack.command('show-credentials',
                    help="Prints the OpenStack credentials.")
 def os_show_credentials():
diff --git a/functest/cli/commands/cli_os.py b/functest/cli/commands/cli_os.py
index 1ec705a5..9057da84 100644
--- a/functest/cli/commands/cli_os.py
+++ b/functest/cli/commands/cli_os.py
@@ -11,13 +11,10 @@
 import os
 
 import click
-import six
 from six.moves.urllib.parse import urlparse
 
 from functest.ci import check_deployment
 from functest.utils.constants import CONST
-import functest.utils.openstack_clean as os_clean
-import functest.utils.openstack_snapshot as os_snapshot
 
 
 class OpenStack(object):
@@ -27,7 +24,6 @@ class OpenStack(object):
         self.endpoint_ip = None
         self.endpoint_port = None
         self.openstack_creds = CONST.__getattribute__('openstack_creds')
-        self.snapshot_file = CONST.__getattribute__('openstack_snapshot_file')
         if self.os_auth_url:
             self.endpoint_ip = urlparse(self.os_auth_url).hostname
             self.endpoint_port = urlparse(self.os_auth_url).port
@@ -56,45 +52,6 @@ class OpenStack(object):
         deployment = check_deployment.CheckDeployment()
         deployment.check_all()
 
-    def snapshot_create(self):
-        self.ping_endpoint()
-        if os.path.isfile(self.snapshot_file):
-            answer = six.moves.input(
-                "It seems there is already an OpenStack "
-                "snapshot. Do you want to overwrite it with "
-                "the current OpenStack status? [y|n]\n")
-            while True:
-                if answer.lower() in ["y", "yes"]:
-                    break
-                elif answer.lower() in ["n", "no"]:
-                    return
-                else:
-                    answer = six.moves.input(
-                        "Invalid answer. Please type [y|n]\n")
-
-        click.echo("Generating Openstack snapshot...")
-        os_snapshot.main()
-
-    def snapshot_show(self):
-        if not os.path.isfile(self.snapshot_file):
-            click.echo("There is no OpenStack snapshot created. To create "
-                       "one run the command "
-                       "'functest openstack snapshot-create'")
-            return
-        with open(self.snapshot_file, 'r') as yaml_file:
-            click.echo("\n%s"
-                       % yaml_file.read())
-
-    def clean(self):
-        self.ping_endpoint()
-        if not os.path.isfile(self.snapshot_file):
-            click.echo("Not possible to clean OpenStack without a snapshot. "
-                       "This could cause problems. "
-                       "Run first the command "
-                       "'functest openstack snapshot-create'")
-            return
-        os_clean.main()
-
 
 class CliOpenStack(OpenStack):
 
-- 
cgit 1.2.3-korg