Rename types module into resources

cloudbridge/providers/aws/__init__.py

@@ -3,4 +3,4 @@ Exports from this provider
 """
 
 from .impl import AWSCloudProviderV1
-from .types import AWSInstance
+from .resources import AWSInstance

cloudbridge/providers/aws/services.py

@@ -13,8 +13,8 @@ from cloudbridge.providers.interfaces import PlacementZone
 from cloudbridge.providers.interfaces import SecurityGroup
 from cloudbridge.providers.interfaces import SecurityService
 
-from .types import AWSInstance
-from .types import AWSMachineImage
+from .resources import AWSInstance
+from .resources import AWSMachineImage
 
 
 class AWSSecurityService(SecurityService):

cloudbridge/providers/interfaces/__init__.py

@@ -9,17 +9,17 @@ from .services import ObjectStoreService
 from .services import ProviderService
 from .services import SecurityService
 from .services import VolumeService
-from .types import CloudProviderServiceType
-from .types import Instance
-from .types import InstanceState
-from .types import InstanceType
-from .types import KeyPair
-from .types import MachineImage
-from .types import MachineImageState
-from .types import ObjectLifeCycleMixin
-from .types import PlacementZone
-from .types import Region
-from .types import SecurityGroup
-from .types import Snapshot
-from .types import Volume
-from .types import WaitStateException
+from .resources import CloudProviderServiceType
+from .resources import Instance
+from .resources import InstanceState
+from .resources import InstanceType
+from .resources import KeyPair
+from .resources import MachineImage
+from .resources import MachineImageState
+from .resources import ObjectLifeCycleMixin
+from .resources import PlacementZone
+from .resources import Region
+from .resources import SecurityGroup
+from .resources import Snapshot
+from .resources import Volume
+from .resources import WaitStateException

cloudbridge/providers/openstack/__init__.py

@@ -3,5 +3,5 @@ Exports from this provider
 """
 
 from .impl import OpenStackCloudProviderV1
-from .types import OpenStackInstance
-from .types import OpenStackInstanceType
+from .resources import OpenStackInstance
+from .resources import OpenStackInstanceType

cloudbridge/providers/openstack/services.py

@@ -14,10 +14,10 @@ from cloudbridge.providers.interfaces import PlacementZone
 from cloudbridge.providers.interfaces import SecurityGroup
 from cloudbridge.providers.interfaces import SecurityService
 
-from .types import OpenStackInstance
-from .types import OpenStackInstanceType
-from .types import OpenStackMachineImage
-from .types import OpenStackRegion
+from .resources import OpenStackInstance
+from .resources import OpenStackInstanceType
+from .resources import OpenStackMachineImage
+from .resources import OpenStackRegion
 
 
 class OpenStackSecurityService(SecurityService):