Remove api = apiName calls from each method

As discussed in https://review.openstack.org/#/c/36352/ for each
command, we were setting api = identity or volume... etc,
this was for an old way of calling commands that are is no longer
used.

Also removed openstackclient/common/command.py

Change-Id: I2705f35d343f2ae729dc22d6aed0b852b2f8ca19

16 files changed, 0 insertions, 87 deletions

diff --git a/openstackclient/identity/v2_0/ec2creds.py b/openstackclient/identity/v2_0/ec2creds.py
index 6a5d2af3..953a3de6 100644
--- a/openstackclient/identity/v2_0/ec2creds.py
+++ b/openstackclient/identity/v2_0/ec2creds.py
@@ -27,7 +27,6 @@ from openstackclient.common import utils
 class CreateEC2Creds(show.ShowOne):
     """Create EC2 credentials"""
 
-    api = "identity"
     log = logging.getLogger(__name__ + ".CreateEC2Creds")
 
     def get_parser(self, prog_name):
@@ -75,7 +74,6 @@ class CreateEC2Creds(show.ShowOne):
 class DeleteEC2Creds(command.Command):
     """Delete EC2 credentials"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteEC2Creds')
 
     def get_parser(self, prog_name):
@@ -111,7 +109,6 @@ class DeleteEC2Creds(command.Command):
 class ListEC2Creds(lister.Lister):
     """List EC2 credentials"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListEC2Creds')
 
     def get_parser(self, prog_name):
@@ -148,7 +145,6 @@ class ListEC2Creds(lister.Lister):
 class ShowEC2Creds(show.ShowOne):
     """Show EC2 credentials"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowEC2Creds')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v2_0/endpoint.py b/openstackclient/identity/v2_0/endpoint.py
index 4ce4fcb2..680465ae 100644
--- a/openstackclient/identity/v2_0/endpoint.py
+++ b/openstackclient/identity/v2_0/endpoint.py
@@ -29,7 +29,6 @@ from openstackclient.common import utils
 class CreateEndpoint(show.ShowOne):
     """Create endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateEndpoint')
 
     def get_parser(self, prog_name):
@@ -78,7 +77,6 @@ class CreateEndpoint(show.ShowOne):
 class DeleteEndpoint(command.Command):
     """Delete endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteEndpoint')
 
     def get_parser(self, prog_name):
@@ -99,7 +97,6 @@ class DeleteEndpoint(command.Command):
 class ListEndpoint(lister.Lister):
     """List endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListEndpoint')
 
     def get_parser(self, prog_name):
@@ -136,7 +133,6 @@ class ListEndpoint(lister.Lister):
 class ShowEndpoint(show.ShowOne):
     """Show endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowEndpoint')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py
index 5c905d91..867230b6 100644
--- a/openstackclient/identity/v2_0/role.py
+++ b/openstackclient/identity/v2_0/role.py
@@ -27,7 +27,6 @@ from openstackclient.common import utils
 class AddRole(show.ShowOne):
     """Add role to tenant:user"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.AddRole')
 
     def get_parser(self, prog_name):
@@ -68,7 +67,6 @@ class AddRole(show.ShowOne):
 class CreateRole(show.ShowOne):
     """Create new role"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateRole')
 
     def get_parser(self, prog_name):
@@ -92,7 +90,6 @@ class CreateRole(show.ShowOne):
 class DeleteRole(command.Command):
     """Delete existing role"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteRole')
 
     def get_parser(self, prog_name):
@@ -114,7 +111,6 @@ class DeleteRole(command.Command):
 class ListRole(lister.Lister):
     """List roles"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListRole')
 
     def take_action(self, parsed_args):
@@ -131,7 +127,6 @@ class ListRole(lister.Lister):
 class ListUserRole(lister.Lister):
     """List user-role assignments"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListUserRole')
 
     def get_parser(self, prog_name):
@@ -181,7 +176,6 @@ class ListUserRole(lister.Lister):
 class RemoveRole(command.Command):
     """Remove role from tenant:user"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.RemoveRole')
 
     def get_parser(self, prog_name):
@@ -218,7 +212,6 @@ class RemoveRole(command.Command):
 class ShowRole(show.ShowOne):
     """Show single role"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowRole')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py
index 51abfc18..9940cb91 100644
--- a/openstackclient/identity/v2_0/service.py
+++ b/openstackclient/identity/v2_0/service.py
@@ -29,7 +29,6 @@ from openstackclient.common import utils
 class CreateService(show.ShowOne):
     """Create service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateService')
 
     def get_parser(self, prog_name):
@@ -65,7 +64,6 @@ class CreateService(show.ShowOne):
 class DeleteService(command.Command):
     """Delete service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteService')
 
     def get_parser(self, prog_name):
@@ -86,7 +84,6 @@ class DeleteService(command.Command):
 class ListService(lister.Lister):
     """List service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListService')
 
     def get_parser(self, prog_name):
@@ -115,7 +112,6 @@ class ListService(lister.Lister):
 class ShowService(show.ShowOne):
     """Show service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowService')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v2_0/tenant.py b/openstackclient/identity/v2_0/tenant.py
index 00a6a977..c9a423c5 100644
--- a/openstackclient/identity/v2_0/tenant.py
+++ b/openstackclient/identity/v2_0/tenant.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateTenant(show.ShowOne):
     """Create tenant command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateTenant')
 
     def get_parser(self, prog_name):
@@ -71,7 +70,6 @@ class CreateTenant(show.ShowOne):
 class DeleteTenant(command.Command):
     """Delete tenant command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteTenant')
 
     def get_parser(self, prog_name):
@@ -94,7 +92,6 @@ class DeleteTenant(command.Command):
 class ListTenant(lister.Lister):
     """List tenant command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListTenant')
 
     def get_parser(self, prog_name):
@@ -123,7 +120,6 @@ class ListTenant(lister.Lister):
 class SetTenant(command.Command):
     """Set tenant command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetTenant')
 
     def get_parser(self, prog_name):
@@ -177,7 +173,6 @@ class SetTenant(command.Command):
 class ShowTenant(show.ShowOne):
     """Show tenant command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowTenant')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py
index 03da6008..39be81af 100644
--- a/openstackclient/identity/v2_0/user.py
+++ b/openstackclient/identity/v2_0/user.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateUser(show.ShowOne):
     """Create user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateUser')
 
     def get_parser(self, prog_name):
@@ -86,7 +85,6 @@ class CreateUser(show.ShowOne):
 class DeleteUser(command.Command):
     """Delete user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteUser')
 
     def get_parser(self, prog_name):
@@ -108,7 +106,6 @@ class DeleteUser(command.Command):
 class ListUser(lister.Lister):
     """List user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListUser')
 
     def get_parser(self, prog_name):
@@ -141,7 +138,6 @@ class ListUser(lister.Lister):
 class SetUser(command.Command):
     """Set user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetUser')
 
     def get_parser(self, prog_name):
@@ -206,7 +202,6 @@ class SetUser(command.Command):
 class ShowUser(show.ShowOne):
     """Show user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowUser')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/credential.py b/openstackclient/identity/v3/credential.py
index c9826052..a2fb43a2 100644
--- a/openstackclient/identity/v3/credential.py
+++ b/openstackclient/identity/v3/credential.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateCredential(show.ShowOne):
     """Create credential command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateCredential')
 
     def get_parser(self, prog_name):
@@ -79,7 +78,6 @@ class CreateCredential(show.ShowOne):
 class DeleteCredential(command.Command):
     """Delete credential command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteCredential')
 
     def get_parser(self, prog_name):
@@ -101,7 +99,6 @@ class DeleteCredential(command.Command):
 class ListCredential(lister.Lister):
     """List credential command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListCredential')
 
     def take_action(self, parsed_args):
@@ -118,7 +115,6 @@ class ListCredential(lister.Lister):
 class SetCredential(command.Command):
     """Set credential command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetCredential')
 
     def get_parser(self, prog_name):
@@ -178,7 +174,6 @@ class SetCredential(command.Command):
 class ShowCredential(show.ShowOne):
     """Show credential command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowCredential')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/domain.py b/openstackclient/identity/v3/domain.py
index e3eaec2f..f6064a58 100644
--- a/openstackclient/identity/v3/domain.py
+++ b/openstackclient/identity/v3/domain.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateDomain(show.ShowOne):
     """Create domain command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateDomain')
 
     def get_parser(self, prog_name):
@@ -72,7 +71,6 @@ class CreateDomain(show.ShowOne):
 class DeleteDomain(command.Command):
     """Delete domain command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteDomain')
 
     def get_parser(self, prog_name):
@@ -96,7 +94,6 @@ class DeleteDomain(command.Command):
 class ListDomain(lister.Lister):
     """List domain command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListDomain')
 
     def take_action(self, parsed_args):
@@ -113,7 +110,6 @@ class ListDomain(lister.Lister):
 class SetDomain(command.Command):
     """Set domain command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetDomain')
 
     def get_parser(self, prog_name):
@@ -172,7 +168,6 @@ class SetDomain(command.Command):
 class ShowDomain(show.ShowOne):
     """Show domain command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowDomain')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/endpoint.py b/openstackclient/identity/v3/endpoint.py
index 4d9b6808..c5f3ebad 100644
--- a/openstackclient/identity/v3/endpoint.py
+++ b/openstackclient/identity/v3/endpoint.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateEndpoint(show.ShowOne):
     """Create endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateEndpoint')
 
     def get_parser(self, prog_name):
@@ -90,7 +89,6 @@ class CreateEndpoint(show.ShowOne):
 class DeleteEndpoint(command.Command):
     """Delete endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteEndpoint')
 
     def get_parser(self, prog_name):
@@ -113,7 +111,6 @@ class DeleteEndpoint(command.Command):
 class ListEndpoint(lister.Lister):
     """List endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListEndpoint')
 
     def get_parser(self, prog_name):
@@ -150,7 +147,6 @@ class ListEndpoint(lister.Lister):
 class SetEndpoint(command.Command):
     """Set endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetEndpoint')
 
     def get_parser(self, prog_name):
@@ -220,7 +216,6 @@ class SetEndpoint(command.Command):
 class ShowEndpoint(show.ShowOne):
     """Show endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowEndpoint')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py
index 21d73966..ca0493eb 100644
--- a/openstackclient/identity/v3/group.py
+++ b/openstackclient/identity/v3/group.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class AddUserToGroup(command.Command):
     """Add user to group"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.AddUserToGroup')
 
     def get_parser(self, prog_name):
@@ -67,7 +66,6 @@ class AddUserToGroup(command.Command):
 class CheckUserInGroup(command.Command):
     """Checks that user is in a specific group"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CheckUserInGroup')
 
     def get_parser(self, prog_name):
@@ -106,7 +104,6 @@ class CheckUserInGroup(command.Command):
 class CreateGroup(show.ShowOne):
     """Create group command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateGroup')
 
     def get_parser(self, prog_name):
@@ -147,7 +144,6 @@ class CreateGroup(show.ShowOne):
 class DeleteGroup(command.Command):
     """Delete group command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteGroup')
 
     def get_parser(self, prog_name):
@@ -169,7 +165,6 @@ class DeleteGroup(command.Command):
 class ListGroup(lister.Lister):
     """List groups and optionally roles assigned to groups"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListGroup')
 
     def get_parser(self, prog_name):
@@ -279,7 +274,6 @@ class ListGroup(lister.Lister):
 class RemoveUserFromGroup(command.Command):
     """Remove user to group"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.RemoveUserFromGroup')
 
     def get_parser(self, prog_name):
@@ -318,7 +312,6 @@ class RemoveUserFromGroup(command.Command):
 class SetGroup(command.Command):
     """Set group command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetGroup')
 
     def get_parser(self, prog_name):
@@ -365,7 +358,6 @@ class SetGroup(command.Command):
 class ShowGroup(show.ShowOne):
     """Show group command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowGroup')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/oauth.py b/openstackclient/identity/v3/oauth.py
index 0b5ae4db..1e803e15 100644
--- a/openstackclient/identity/v3/oauth.py
+++ b/openstackclient/identity/v3/oauth.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class AuthorizeRequestToken(show.ShowOne):
     """Authorize request token command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.AuthorizeRequestToken')
 
     def get_parser(self, prog_name):
@@ -68,7 +67,6 @@ class AuthorizeRequestToken(show.ShowOne):
 class CreateAccessToken(show.ShowOne):
     """Create access token command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateAccessToken')
 
     def get_parser(self, prog_name):
@@ -107,7 +105,6 @@ class CreateAccessToken(show.ShowOne):
 class CreateConsumer(show.ShowOne):
     """Create consumer command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateConsumer')
 
     def get_parser(self, prog_name):
@@ -133,7 +130,6 @@ class CreateConsumer(show.ShowOne):
 class CreateRequestToken(show.ShowOne):
     """Create request token command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateRequestToken')
 
     def get_parser(self, prog_name):
@@ -164,7 +160,6 @@ class CreateRequestToken(show.ShowOne):
 class DeleteConsumer(command.Command):
     """Delete consumer command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteConsumer')
 
     def get_parser(self, prog_name):
@@ -188,7 +183,6 @@ class DeleteConsumer(command.Command):
 class ListConsumer(lister.Lister):
     """List consumer command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListConsumer')
 
     def take_action(self, parsed_args):
@@ -205,7 +199,6 @@ class ListConsumer(lister.Lister):
 class SetConsumer(command.Command):
     """Set consumer command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetConsumer')
 
     def get_parser(self, prog_name):
@@ -241,7 +234,6 @@ class SetConsumer(command.Command):
 class ShowConsumer(show.ShowOne):
     """Show consumer command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowConsumer')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/policy.py b/openstackclient/identity/v3/policy.py
index ccfc3635..ac14cc46 100644
--- a/openstackclient/identity/v3/policy.py
+++ b/openstackclient/identity/v3/policy.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreatePolicy(show.ShowOne):
     """Create policy command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreatePolicy')
 
     def get_parser(self, prog_name):
@@ -61,7 +60,6 @@ class CreatePolicy(show.ShowOne):
 class DeletePolicy(command.Command):
     """Delete policy command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeletePolicy')
 
     def get_parser(self, prog_name):
@@ -83,7 +81,6 @@ class DeletePolicy(command.Command):
 class ListPolicy(lister.Lister):
     """List policy command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListPolicy')
 
     def get_parser(self, prog_name):
@@ -113,7 +110,6 @@ class ListPolicy(lister.Lister):
 class SetPolicy(command.Command):
     """Set policy command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetPolicy')
 
     def get_parser(self, prog_name):
@@ -159,7 +155,6 @@ class SetPolicy(command.Command):
 class ShowPolicy(show.ShowOne):
     """Show policy command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowPolicy')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py
index 84271cd9..9d1e360b 100644
--- a/openstackclient/identity/v3/project.py
+++ b/openstackclient/identity/v3/project.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateProject(show.ShowOne):
     """Create project command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateProject')
 
     def get_parser(self, prog_name):
@@ -85,7 +84,6 @@ class CreateProject(show.ShowOne):
 class DeleteProject(command.Command):
     """Delete project command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteProject')
 
     def get_parser(self, prog_name):
@@ -108,7 +106,6 @@ class DeleteProject(command.Command):
 class ListProject(lister.Lister):
     """List project command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListProject')
 
     def get_parser(self, prog_name):
@@ -137,7 +134,6 @@ class ListProject(lister.Lister):
 class SetProject(command.Command):
     """Set project command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetProject')
 
     def get_parser(self, prog_name):
@@ -199,7 +195,6 @@ class SetProject(command.Command):
 class ShowProject(show.ShowOne):
     """Show project command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowProject')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py
index 7387509a..9be3b784 100644
--- a/openstackclient/identity/v3/role.py
+++ b/openstackclient/identity/v3/role.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class AddRole(command.Command):
     """Adds a role to a user or group on a domain or project"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.AddRole')
 
     def get_parser(self, prog_name):
@@ -108,7 +107,6 @@ class AddRole(command.Command):
 class CreateRole(show.ShowOne):
     """Create new role"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateRole')
 
     def get_parser(self, prog_name):
@@ -131,7 +129,6 @@ class CreateRole(show.ShowOne):
 class DeleteRole(command.Command):
     """Delete existing role"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteRole')
 
     def get_parser(self, prog_name):
@@ -155,7 +152,6 @@ class DeleteRole(command.Command):
 class ListRole(lister.Lister):
     """List roles"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListRole')
 
     def take_action(self, parsed_args):
@@ -172,7 +168,6 @@ class ListRole(lister.Lister):
 class RemoveRole(command.Command):
     """Remove role command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.RemoveRole')
 
     def get_parser(self, prog_name):
@@ -251,7 +246,6 @@ class RemoveRole(command.Command):
 class SetRole(command.Command):
     """Set role command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetRole')
 
     def get_parser(self, prog_name):
@@ -285,7 +279,6 @@ class SetRole(command.Command):
 class ShowRole(show.ShowOne):
     """Show single role"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowRole')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/service.py b/openstackclient/identity/v3/service.py
index 023c858e..5c82284c 100644
--- a/openstackclient/identity/v3/service.py
+++ b/openstackclient/identity/v3/service.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateService(show.ShowOne):
     """Create service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateService')
 
     def get_parser(self, prog_name):
@@ -69,7 +68,6 @@ class CreateService(show.ShowOne):
 class DeleteService(command.Command):
     """Delete service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteService')
 
     def get_parser(self, prog_name):
@@ -94,7 +92,6 @@ class DeleteService(command.Command):
 class ListService(lister.Lister):
     """List service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListService')
 
     def take_action(self, parsed_args):
@@ -111,7 +108,6 @@ class ListService(lister.Lister):
 class SetService(show.ShowOne):
     """Set service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetService')
 
     def get_parser(self, prog_name):
@@ -165,7 +161,6 @@ class SetService(show.ShowOne):
 class ShowService(show.ShowOne):
     """Show service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowService')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py
index 53550cda..aac70274 100644
--- a/openstackclient/identity/v3/user.py
+++ b/openstackclient/identity/v3/user.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateUser(show.ShowOne):
     """Create user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateUser')
 
     def get_parser(self, prog_name):
@@ -113,7 +112,6 @@ class CreateUser(show.ShowOne):
 class DeleteUser(command.Command):
     """Delete user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteUser')
 
     def get_parser(self, prog_name):
@@ -137,7 +135,6 @@ class DeleteUser(command.Command):
 class ListUser(lister.Lister):
     """List users and optionally roles assigned to users"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListUser')
 
     def get_parser(self, prog_name):
@@ -249,7 +246,6 @@ class ListUser(lister.Lister):
 class SetUser(command.Command):
     """Set user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetUser')
 
     def get_parser(self, prog_name):
@@ -338,7 +334,6 @@ class SetUser(command.Command):
 class ShowUser(show.ShowOne):
     """Show user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowUser')
 
     def get_parser(self, prog_name):