Fix generation of class docs

docs/api_docs/cloud/resources.rst

@@ -3,117 +3,117 @@ Resources
 
 .. contents:: :local:
 
-CloudBridgeBaseException
+CloudProviderServiceType
 ------------------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.CloudBridgeBaseException
+.. autoclass:: cloudbridge.cloud.interfaces.resources.CloudProviderServiceType
     :members:
 
-CloudProviderServiceType
+CloudBridgeBaseException
 ------------------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.CloudProviderServiceType
+.. autoclass:: cloudbridge.cloud.interfaces.resources.CloudBridgeBaseException
     :members:
 
-Bucket
----------
-.. autoclass:: cloudbridge.cloud.interfaces.services.Bucket
+WaitStateException
+------------------
+.. autoclass:: cloudbridge.cloud.interfaces.resources.WaitStateException
     :members:
 
-BucketObject
----------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.BucketObject
+InvalidConfigurationException
+-----------------------------
+.. autoclass:: cloudbridge.cloud.interfaces.resources.InvalidConfigurationException
     :members:
 
-Instance
---------
-.. autoclass:: cloudbridge.cloud.interfaces.services.Instance
+ObjectLifeCycleMixin
+--------------------
+.. autoclass:: cloudbridge.cloud.interfaces.resources.ObjectLifeCycleMixin
     :members:
 
-InstanceState
--------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.InstanceState
+ResultList
+----------
+.. autoclass:: cloudbridge.cloud.interfaces.resources.ResultList
     :members:
 
-InstanceType
-------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.InstanceType
+InstanceState
+-------------
+.. autoclass:: cloudbridge.cloud.interfaces.resources.InstanceState
     :members:
 
-InvalidConfigurationException
------------------------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.InvalidConfigurationException
+Instance
+--------
+.. autoclass:: cloudbridge.cloud.interfaces.resources.Instance
     :members:
 
-KeyPair
--------
-.. autoclass:: cloudbridge.cloud.interfaces.services.KeyPair
+MachineImageState
+-----------------
+.. autoclass:: cloudbridge.cloud.interfaces.resources.MachineImageState
     :members:
 
 LaunchConfig
 ------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.LaunchConfig
+.. autoclass:: cloudbridge.cloud.interfaces.resources.LaunchConfig
     :members:
 
 MachineImage
 ------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.MachineImage
+.. autoclass:: cloudbridge.cloud.interfaces.resources.MachineImage
     :members:
 
-MachineImageState
------------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.MachineImageState
+VolumeState
+-----------
+.. autoclass:: cloudbridge.cloud.interfaces.resources.VolumeState
     :members:
 
-ObjectLifeCycleMixin
---------------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.ObjectLifeCycleMixin
+Volume
+------
+.. autoclass:: cloudbridge.cloud.interfaces.resources.Volume
     :members:
 
-PlacementZone
+SnapshotState
 -------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.PlacementZone
+.. autoclass:: cloudbridge.cloud.interfaces.resources.SnapshotState
     :members:
 
-Region
-------
-.. autoclass:: cloudbridge.cloud.interfaces.services.Region
+Snapshot
+--------
+.. autoclass:: cloudbridge.cloud.interfaces.resources.Snapshot
     :members:
 
-ResultList
-----------
-.. autoclass:: cloudbridge.cloud.interfaces.services.ResultList
+KeyPair
+-------
+.. autoclass:: cloudbridge.cloud.interfaces.resources.KeyPair
     :members:
 
-SecurityGroup
--------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.SecurityGroup
+Region
+------
+.. autoclass:: cloudbridge.cloud.interfaces.resources.Region
     :members:
 
-SecurityGroupRule
------------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.SecurityGroupRule
+PlacementZone
+-------------
+.. autoclass:: cloudbridge.cloud.interfaces.resources.PlacementZone
     :members:
 
-Snapshot
---------
-.. autoclass:: cloudbridge.cloud.interfaces.services.Snapshot
+InstanceType
+------------
+.. autoclass:: cloudbridge.cloud.interfaces.resources.InstanceType
     :members:
 
-SnapshotState
+SecurityGroup
 -------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.SnapshotState
+.. autoclass:: cloudbridge.cloud.interfaces.resources.SecurityGroup
     :members:
 
-Volume
-------
-.. autoclass:: cloudbridge.cloud.interfaces.services.Volume
+SecurityGroupRule
+-----------------
+.. autoclass:: cloudbridge.cloud.interfaces.resources.SecurityGroupRule
     :members:
 
-VolumeState
------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.VolumeState
+BucketObject
+---------------
+.. autoclass:: cloudbridge.cloud.interfaces.resources.BucketObject
     :members:
 
-WaitStateException
-------------------
-.. autoclass:: cloudbridge.cloud.interfaces.services.WaitStateException
+Bucket
+---------
+.. autoclass:: cloudbridge.cloud.interfaces.resources.Bucket
     :members:

docs/api_docs/cloud/services.rst

@@ -3,67 +3,67 @@ Services
 
 .. contents:: :local:
 
-BlockStoreService
------------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.BlockStoreService
+ProviderService
+---------------
+.. autoclass:: cloudbridge.cloud.interfaces.services.ProviderService
     :members:
 
 ComputeService
 --------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.ComputeService
+.. autoclass:: cloudbridge.cloud.interfaces.services.ComputeService
     :members:
 
-ImageService
-------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.ImageService
+InstanceService
+---------------
+.. autoclass:: cloudbridge.cloud.interfaces.services.InstanceService
     :members:
 
-InstanceService
+VolumeService
+-------------
+.. autoclass:: cloudbridge.cloud.interfaces.services.VolumeService
+    :members:
+
+SnapshotService
 ---------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.InstanceService
+.. autoclass:: cloudbridge.cloud.interfaces.services.SnapshotService
     :members:
 
-InstanceTypesService
---------------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.InstanceTypesService
+BlockStoreService
+-----------------
+.. autoclass:: cloudbridge.cloud.interfaces.services.BlockStoreService
     :members:
 
-KeyPairService
---------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.KeyPairService
+ImageService
+------------
+.. autoclass:: cloudbridge.cloud.interfaces.services.ImageService
     :members:
 
 ObjectStoreService
 ------------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.ObjectStoreService
+.. autoclass:: cloudbridge.cloud.interfaces.services.ObjectStoreService
     :members:
 
-ProviderService
+SecurityService
 ---------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.ProviderService
+.. autoclass:: cloudbridge.cloud.interfaces.services.SecurityService
     :members:
 
-RegionService
--------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.RegionService
+KeyPairService
+--------------
+.. autoclass:: cloudbridge.cloud.interfaces.services.KeyPairService
     :members:
 
 SecurityGroupService
 --------------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.SecurityGroupService
+.. autoclass:: cloudbridge.cloud.interfaces.services.SecurityGroupService
     :members:
 
-SecurityService
----------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.SecurityService
-    :members:
-
-SnapshotService
----------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.SnapshotService
+InstanceTypesService
+--------------------
+.. autoclass:: cloudbridge.cloud.interfaces.services.InstanceTypesService
     :members:
 
-VolumeService
+RegionService
 -------------
-.. autoclass:: cloudbridge.cloud.interfaces.resources.VolumeService
+.. autoclass:: cloudbridge.cloud.interfaces.services.RegionService
     :members: