Răsfoiți Sursa

Fixed linting errors

Nuwan Goonasekera 7 ani în urmă
părinte
comite
a3528294b1

+ 4 - 4
cloudbridge/cloud/providers/gce/provider.py

@@ -9,16 +9,16 @@ import re
 import time
 import time
 from string import Template
 from string import Template
 
 
-import cloudbridge as cb
-from cloudbridge.cloud.base import BaseCloudProvider
-from cloudbridge.cloud.interfaces.exceptions import ProviderConnectionException
-
 import googleapiclient
 import googleapiclient
 from googleapiclient import discovery
 from googleapiclient import discovery
 
 
 from oauth2client.client import GoogleCredentials
 from oauth2client.client import GoogleCredentials
 from oauth2client.service_account import ServiceAccountCredentials
 from oauth2client.service_account import ServiceAccountCredentials
 
 
+import cloudbridge as cb
+from cloudbridge.cloud.base import BaseCloudProvider
+from cloudbridge.cloud.interfaces.exceptions import ProviderConnectionException
+
 from .services import GCEComputeService
 from .services import GCEComputeService
 from .services import GCENetworkingService
 from .services import GCENetworkingService
 from .services import GCESecurityService
 from .services import GCESecurityService

+ 2 - 2
cloudbridge/cloud/providers/gce/resources.py

@@ -10,6 +10,8 @@ import math
 import time
 import time
 import uuid
 import uuid
 
 
+import googleapiclient
+
 import cloudbridge as cb
 import cloudbridge as cb
 import cloudbridge.cloud.base.helpers as cb_helpers
 import cloudbridge.cloud.base.helpers as cb_helpers
 from cloudbridge.cloud.base.resources import BaseAttachmentInfo
 from cloudbridge.cloud.base.resources import BaseAttachmentInfo
@@ -48,8 +50,6 @@ from cloudbridge.cloud.interfaces.resources import TrafficDirection
 from cloudbridge.cloud.interfaces.resources import VolumeState
 from cloudbridge.cloud.interfaces.resources import VolumeState
 from cloudbridge.cloud.providers.gce import helpers
 from cloudbridge.cloud.providers.gce import helpers
 
 
-import googleapiclient
-
 # Older versions of Python do not have a built-in set data-structure.
 # Older versions of Python do not have a built-in set data-structure.
 try:
 try:
     set
     set

+ 4 - 4
cloudbridge/cloud/providers/gce/services.py

@@ -3,6 +3,10 @@ import time
 import uuid
 import uuid
 from collections import namedtuple
 from collections import namedtuple
 
 
+import googleapiclient
+
+from retrying import retry
+
 import cloudbridge as cb
 import cloudbridge as cb
 from cloudbridge.cloud.base.resources import BaseNetwork
 from cloudbridge.cloud.base.resources import BaseNetwork
 from cloudbridge.cloud.base.resources import ClientPagedResultList
 from cloudbridge.cloud.base.resources import ClientPagedResultList
@@ -28,10 +32,6 @@ from cloudbridge.cloud.interfaces.resources import TrafficDirection
 from cloudbridge.cloud.interfaces.resources import VMFirewall
 from cloudbridge.cloud.interfaces.resources import VMFirewall
 from cloudbridge.cloud.providers.gce import helpers
 from cloudbridge.cloud.providers.gce import helpers
 
 
-import googleapiclient
-
-from retrying import retry
-
 from .resources import GCEFirewallsDelegate
 from .resources import GCEFirewallsDelegate
 from .resources import GCEInstance
 from .resources import GCEInstance
 from .resources import GCEKeyPair
 from .resources import GCEKeyPair

+ 1 - 0
test/test_compute_service.py

@@ -303,6 +303,7 @@ class CloudComputeServiceTestCase(ProviderTestBase):
                                   " complete successfully: %s" % e)
                                   " complete successfully: %s" % e)
                     # TODO: Check instance attachments and make sure they
                     # TODO: Check instance attachments and make sure they
                     # correspond to requested mappings
                     # correspond to requested mappings
+
     @helpers.skipIfNoService(['compute.instances', 'networking.networks',
     @helpers.skipIfNoService(['compute.instances', 'networking.networks',
                               'security.vm_firewalls'])
                               'security.vm_firewalls'])
     def test_instance_methods(self):
     def test_instance_methods(self):

+ 1 - 1
test/test_network_service.py

@@ -1,3 +1,4 @@
+from cloudbridge.cloud.base.resources import BaseNetwork
 from cloudbridge.cloud.interfaces.resources import FloatingIP
 from cloudbridge.cloud.interfaces.resources import FloatingIP
 from cloudbridge.cloud.interfaces.resources import Network
 from cloudbridge.cloud.interfaces.resources import Network
 from cloudbridge.cloud.interfaces.resources import NetworkState
 from cloudbridge.cloud.interfaces.resources import NetworkState
@@ -10,7 +11,6 @@ from test.helpers import ProviderTestBase
 from test.helpers import get_provider_test_data
 from test.helpers import get_provider_test_data
 from test.helpers import standard_interface_tests as sit
 from test.helpers import standard_interface_tests as sit
 
 
-from cloudbridge.cloud.base.resources import BaseNetwork
 
 
 class CloudNetworkServiceTestCase(ProviderTestBase):
 class CloudNetworkServiceTestCase(ProviderTestBase):