From 5fd8f1bbb1fc562a2a729011f2d56f0a0963f792 Mon Sep 17 00:00:00 2001
From: Cai Hui <cai.hui@zte.com.cn>
Date: Fri, 19 Oct 2018 07:18:48 -0400
Subject: [PATCH] Remove "--os-identity-api-version" argument

Following commits:
  Change 608808
  Change 604284
  Use keystoneauth1.load.get_plugin_loader to load and discovery dynamically
without explicitly specifying V2 or V3 of keystone.

  The argument of "--os-identity-api-version" is no longer required.

Change-Id: Idbd324d30489ae3c6a279e7147387fea81f39063
---
 doc/source/cli/details.rst | 4 ----
 freezerclient/shell.py     | 8 --------
 freezerclient/v1/client.py | 5 +----
 freezerclient/v2/client.py | 5 +----
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/doc/source/cli/details.rst b/doc/source/cli/details.rst
index 21f4b1b..c3112a7 100644
--- a/doc/source/cli/details.rst
+++ b/doc/source/cli/details.rst
@@ -25,7 +25,6 @@ freezer usage
                   [--os-auth-url OS_AUTH_URL] [--os-backup-url OS_BACKUP_URL]
                   [--os-backup-api-version OS_BACKUP_API_VERSION]
                   [--os-endpoint-type OS_ENDPOINT_TYPE]
-                  [--os-identity-api-version OS_IDENTITY_API_VERSION]
                   [--os-password OS_PASSWORD] [--os-username OS_USERNAME]
                   [--os-token OS_TOKEN]
                   [--os-project-domain-name OS_PROJECT_DOMAIN_NAME]
@@ -74,9 +73,6 @@ freezer optional arguments
   "public" or "publicURL", "internal" or "internalURL",
   "admin" or "adminURL"
 
-``--os-identity-api-version OS_IDENTITY_API_VERSION``
-  Identity API version: 2.0 or 3
-
 ``--os-password OS_PASSWORD``
   Password used for authentication with the OpenStack
   Identity service
diff --git a/freezerclient/shell.py b/freezerclient/shell.py
index 756ae76..0bf22df 100644
--- a/freezerclient/shell.py
+++ b/freezerclient/shell.py
@@ -122,13 +122,6 @@ class FreezerShell(app.App):
                     "admin" or "adminURL"'''
         )
 
-        parser.add_argument(
-            '--os-identity-api-version',
-            dest='os_identity_api_version',
-            default=os.environ.get('OS_IDENTITY_API_VERSION'),
-            help='Identity API version: 2.0 or 3'
-        )
-
         parser.add_argument(
             '--os-password',
             dest='os_password',
@@ -241,7 +234,6 @@ class FreezerShell(app.App):
         """
         opts = {
             'token': self.options.os_token,
-            'version': self.options.os_identity_api_version,
             'username': self.options.os_username,
             'password': self.options.os_password,
             'tenant_name': self.options.os_project_name,
diff --git a/freezerclient/v1/client.py b/freezerclient/v1/client.py
index 8402ba1..b125631 100644
--- a/freezerclient/v1/client.py
+++ b/freezerclient/v1/client.py
@@ -30,7 +30,7 @@ class Client(object):
     """Client for the OpenStack Disaster Recovery v1 API.
     """
 
-    def __init__(self, version='3', token=None, username=None, password=None,
+    def __init__(self, token=None, username=None, password=None,
                  tenant_name=None, auth_url=None, session=None, endpoint=None,
                  endpoint_type=None, opts=None, project_name=None,
                  user_domain_name=None, user_domain_id=None,
@@ -38,7 +38,6 @@ class Client(object):
                  cert=None, cacert=None, insecure=False, project_id=None):
         """
         Initialize a new client for the Disaster Recovery v1 API.
-        :param version: keystone version to use
         :param token: keystone token
         :param username: openstack username
         :param password: openstack password
@@ -82,8 +81,6 @@ class Client(object):
             self.opts.os_user_domain_id = user_domain_id or None
             self.opts.os_project_domain_name = project_domain_name or None
             self.opts.os_project_domain_id = project_domain_id or None
-            self.opts.auth_version = version
-            self.opts.os_identity_api_version = version
             self.opts.os_cacert = cacert or None
             self.opts.insecure = insecure
             self.opts.cert = cert
diff --git a/freezerclient/v2/client.py b/freezerclient/v2/client.py
index e295283..e7f41e9 100644
--- a/freezerclient/v2/client.py
+++ b/freezerclient/v2/client.py
@@ -30,7 +30,7 @@ class Client(object):
     """Client for the OpenStack Disaster Recovery v1 API.
     """
 
-    def __init__(self, version='3', token=None, username=None, password=None,
+    def __init__(self, token=None, username=None, password=None,
                  tenant_name=None, auth_url=None, session=None, endpoint=None,
                  endpoint_type=None, opts=None, project_name=None,
                  user_domain_name=None, user_domain_id=None,
@@ -38,7 +38,6 @@ class Client(object):
                  cert=None, cacert=None, insecure=False, project_id=None):
         """
         Initialize a new client for the Disaster Recovery v1 API.
-        :param version: keystone version to use
         :param token: keystone token
         :param username: openstack username
         :param password: openstack password
@@ -82,8 +81,6 @@ class Client(object):
             self.opts.os_user_domain_id = user_domain_id or None
             self.opts.os_project_domain_name = project_domain_name or None
             self.opts.os_project_domain_id = project_domain_id or None
-            self.opts.auth_version = version
-            self.opts.os_identity_api_version = version
             self.opts.os_cacert = cacert or None
             self.opts.insecure = insecure
             self.opts.cert = cert