@@ -31,15 +31,15 @@ openstack.cli =
 openstack.cli.extension =
     compute = openstackclient.compute.client
     image = openstackclient.image.client
+    network = openstackclient.network.client
     object_store = openstackclient.object.client
     volume = openstackclient.volume.client
-    network = openstackclient.network.client
 
 openstack.common =
+    extension_list = openstackclient.common.extension:ListExtension
     limits_show = openstackclient.common.limits:ShowLimits
     quota_set = openstackclient.common.quota:SetQuota
     quota_show = openstackclient.common.quota:ShowQuota
-    extension_list = openstackclient.common.extension:ListExtension
 
 openstack.compute.v2 =
     compute_agent_create = openstackclient.compute.v2.agent:CreateAgent
@@ -144,26 +144,26 @@ openstack.identity.v2_0 =
     role_add = openstackclient.identity.v2_0.role:AddRole
     role_create = openstackclient.identity.v2_0.role:CreateRole
     role_delete = openstackclient.identity.v2_0.role:DeleteRole
-    role_list =openstackclient.identity.v2_0.role:ListRole
+    role_list = openstackclient.identity.v2_0.role:ListRole
     role_remove = openstackclient.identity.v2_0.role:RemoveRole
-    role_show =openstackclient.identity.v2_0.role:ShowRole
+    role_show = openstackclient.identity.v2_0.role:ShowRole
 
     service_create = openstackclient.identity.v2_0.service:CreateService
     service_delete = openstackclient.identity.v2_0.service:DeleteService
-    service_list =openstackclient.identity.v2_0.service:ListService
-    service_show =openstackclient.identity.v2_0.service:ShowService
+    service_list = openstackclient.identity.v2_0.service:ListService
+    service_show = openstackclient.identity.v2_0.service:ShowService
 
     token_issue = openstackclient.identity.v2_0.token:IssueToken
     token_revoke = openstackclient.identity.v2_0.token:RevokeToken
 
-    user_role_list = openstackclient.identity.v2_0.role:ListUserRole
-
     user_create = openstackclient.identity.v2_0.user:CreateUser
     user_delete = openstackclient.identity.v2_0.user:DeleteUser
     user_list = openstackclient.identity.v2_0.user:ListUser
     user_set = openstackclient.identity.v2_0.user:SetUser
     user_show = openstackclient.identity.v2_0.user:ShowUser
 
+    user_role_list = openstackclient.identity.v2_0.role:ListUserRole
+
 openstack.identity.v3 =
     access_token_create = openstackclient.identity.v3.token:CreateAccessToken
 
@@ -258,25 +258,32 @@ openstack.image.v2 =
     image_save = openstackclient.image.v2.image:SaveImage
     image_show = openstackclient.image.v2.image:ShowImage
 
+openstack.network.v2_0 =
+    network_create = openstackclient.network.v2_0.network:CreateNetwork
+    network_delete = openstackclient.network.v2_0.network:DeleteNetwork
+    network_list = openstackclient.network.v2_0.network:ListNetwork
+    network_set = openstackclient.network.v2_0.network:SetNetwork
+    network_show = openstackclient.network.v2_0.network:ShowNetwork
+
 openstack.object_store.v1 =
     container_list = openstackclient.object.v1.container:ListContainer
     container_show = openstackclient.object.v1.container:ShowContainer
     object_list = openstackclient.object.v1.object:ListObject
     object_show = openstackclient.object.v1.object:ShowObject
 
 openstack.volume.v1 =
-    snapshot_create = openstackclient.volume.v1.snapshot:CreateSnapshot
-    snapshot_delete = openstackclient.volume.v1.snapshot:DeleteSnapshot
-    snapshot_list = openstackclient.volume.v1.snapshot:ListSnapshot
-    snapshot_set = openstackclient.volume.v1.snapshot:SetSnapshot
-    snapshot_show = openstackclient.volume.v1.snapshot:ShowSnapshot
-
     backup_create = openstackclient.volume.v1.backup:CreateBackup
     backup_delete = openstackclient.volume.v1.backup:DeleteBackup
     backup_list = openstackclient.volume.v1.backup:ListBackup
     backup_restore = openstackclient.volume.v1.backup:RestoreBackup
     backup_show = openstackclient.volume.v1.backup:ShowBackup
 
+    snapshot_create = openstackclient.volume.v1.snapshot:CreateSnapshot
+    snapshot_delete = openstackclient.volume.v1.snapshot:DeleteSnapshot
+    snapshot_list = openstackclient.volume.v1.snapshot:ListSnapshot
+    snapshot_set = openstackclient.volume.v1.snapshot:SetSnapshot
+    snapshot_show = openstackclient.volume.v1.snapshot:ShowSnapshot
+
     volume_create = openstackclient.volume.v1.volume:CreateVolume
     volume_delete = openstackclient.volume.v1.volume:DeleteVolume
     volume_list = openstackclient.volume.v1.volume:ListVolume
@@ -290,13 +297,6 @@ openstack.volume.v1 =
     volume_type_set = openstackclient.volume.v1.type:SetVolumeType
     volume_type_unset = openstackclient.volume.v1.type:UnsetVolumeType
 
-openstack.network.v2_0 =
-    network_create = openstackclient.network.v2_0.network:CreateNetwork
-    network_delete = openstackclient.network.v2_0.network:DeleteNetwork
-    network_list = openstackclient.network.v2_0.network:ListNetwork
-    network_set = openstackclient.network.v2_0.network:SetNetwork
-    network_show = openstackclient.network.v2_0.network:ShowNetwork
-
 [build_sphinx]
 source-dir = doc/source
 build-dir = doc/build