Nuwan Goonasekera 8 лет назад
Родитель
Сommit
3a261a7fce

+ 4 - 5
cloudbridge/cloud/base/provider.py

@@ -48,7 +48,7 @@ class BaseConfiguration(Configuration):
         """
         Gets the default wait timeout for LifeCycleObjects.
         """
-        log.debug("Default wait timeout for LifeCycleObjects %s ",
+        log.debug("Default wait timeout for LifeCycleObjects %s",
                   DEFAULT_WAIT_TIMEOUT)
         return self.get('default_wait_timeout', DEFAULT_WAIT_TIMEOUT)
 
@@ -57,7 +57,7 @@ class BaseConfiguration(Configuration):
         """
         Gets the default wait interval for LifeCycleObjects.
         """
-        log.debug("Default wait interfal for LifeCycleObjects  %s",
+        log.debug("Default wait interfal for LifeCycleObjects %s",
                   DEFAULT_WAIT_INTERVAL)
         return self.get('default_wait_interval', DEFAULT_WAIT_INTERVAL)
 
@@ -103,7 +103,7 @@ class BaseCloudProvider(CloudProvider):
             self.security.key_pairs.list()
             return True
         except Exception as e:
-            log.exception("ProviderConnectionException ocurred", e)
+            log.exception("ProviderConnectionException occurred")
             raise ProviderConnectionException(
                 "Authentication with cloud provider failed: %s" % (e,))
 
@@ -148,8 +148,7 @@ class BaseCloudProvider(CloudProvider):
 
         :return: a configuration value for the supplied ``key``
         """
-        log.info("Extracting a configuration value using the key %s "
-                 "and value %s", key, default_value)
+        log.info("Getting config key: %s with default: %s", key, default_value)
         if isinstance(self.config, dict) and self.config.get(key):
             return self.config.get(key, default_value)
         elif hasattr(self.config, key) and getattr(self.config, key):

+ 3 - 3
cloudbridge/cloud/base/resources.py

@@ -198,7 +198,7 @@ class BaseCloudResource(CloudResource):
     @staticmethod
     def assert_valid_resource_name(name):
         if not BaseCloudResource.is_valid_resource_name(name):
-            log.exception("InvalidNameException raised on %s", name)
+            log.debug("InvalidNameException raised on %s", name, exc_info=True)
             raise InvalidNameException(
                 u"Invalid name: %s. Name must be at most 63 characters "
                 "long and consist of lowercase letters, numbers, "
@@ -842,7 +842,7 @@ class BaseBucketObject(BaseCloudResource, BucketObject):
     @staticmethod
     def assert_valid_resource_name(name):
         if not BaseBucketObject.is_valid_resource_name(name):
-            log.exception("InvalidNameException raised on %s", name)
+            log.debug("InvalidNameException raised on %s", name, exc_info=True)
             raise InvalidNameException(
                 u"Invalid object name: %s. Name must match criteria defined "
                 "in: http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMeta"
@@ -888,7 +888,7 @@ class BaseBucket(BaseCloudResource, Bucket):
     @staticmethod
     def assert_valid_resource_name(name):
         if not BaseBucket.is_valid_resource_name(name):
-            log.exception("InvalidNameException raised on %s", name)
+            log.debug("Invalid resource name %s", name, exc_info=True)
             raise InvalidNameException(
                 u"Invalid bucket name: %s. Name must match criteria defined "
                 "in: http://docs.aws.amazon.com/awscloudtrail/latest/userguide"

+ 1 - 2
cloudbridge/cloud/factory.py

@@ -46,7 +46,6 @@ class CloudProviderFactory(object):
         if isinstance(cls, type) and issubclass(cls, CloudProvider):
             if hasattr(cls, "PROVIDER_ID"):
                 provider_id = getattr(cls, "PROVIDER_ID")
-                log.debug("Cloud provider: " + provider_id)
                 if issubclass(cls, TestMockHelperMixin):
                     if self.provider_list.get(provider_id, {}).get(
                             'mock_class'):
@@ -74,7 +73,7 @@ class CloudProviderFactory(object):
         Note that this methods does not guard against a failed import.
         """
         for _, modname, _ in pkgutil.iter_modules(providers.__path__):
-            log.debug("Importing provider: " + modname)
+            log.debug("Importing provider: %s", modname)
             self._import_provider(modname)
 
     def _import_provider(self, module_name):

+ 3 - 3
cloudbridge/cloud/providers/aws/services.py

@@ -278,9 +278,9 @@ class AWSBucketService(BaseBucketService):
             # http://stackoverflow.com/questions/32331456/using-boto-upload-file-to-s3-
             # sub-folder-when-i-have-no-permissions-on-listing-fo
             if e.response['Error']['Code'] == 403:
-                log.exception("AWS Bucket %s already exists but user doesn't "
-                              "have enough permissions to access the bucket",
-                              bucket_id)
+                log.warning("AWS Bucket %s already exists but user doesn't "
+                            "have enough permissions to access the bucket",
+                            bucket_id)
                 bucket = self.provider.s3_conn.get_bucket(bucket_id,
                                                           validate=False)
                 return AWSBucket(self.provider, bucket)

+ 9 - 8
cloudbridge/cloud/providers/openstack/services.py

@@ -136,7 +136,7 @@ class OpenStackKeyPairService(BaseKeyPairService):
             return OpenStackKeyPair(
                 self.provider, self.provider.nova.keypairs.get(key_pair_id))
         except NovaNotFound:
-            log.exception("NovaNotFound exception raised")
+            log.debug("KeyPair %s was not found.", key_pair_id)
             return None
 
     def list(self, limit=None, marker=None):
@@ -181,7 +181,7 @@ class OpenStackKeyPairService(BaseKeyPairService):
         kp = self.provider.nova.keypairs.create(name)
         if kp:
             return OpenStackKeyPair(self.provider, kp)
-        log.exception("Key Pair with the name %s already exists", name)
+        log.debug("Key Pair with the name %s already exists", name)
         return None
 
 
@@ -197,7 +197,7 @@ class OpenStackVMFirewallService(BaseVMFirewallService):
                 self.provider,
                 self.provider.os_conn.network.get_security_group(firewall_id))
         except ResourceNotFound:
-            log.exception("Firewall %s not found.", firewall_id)
+            log.debug("Firewall %s not found.", firewall_id)
             return None
 
     def list(self, limit=None, marker=None):
@@ -249,8 +249,8 @@ class OpenStackImageService(BaseImageService):
             return OpenStackMachineImage(
                 self.provider, self.provider.os_conn.image.get_image(image_id))
         except ResourceNotFound:
-            log.exception("ResourceNotFound exception raised, %s not found",
-                          image_id)
+            log.debug("ResourceNotFound exception raised, %s not found",
+                      image_id)
             return None
 
     def find(self, name, limit=None, marker=None):
@@ -332,7 +332,7 @@ class OpenStackVolumeService(BaseVolumeService):
             return OpenStackVolume(
                 self.provider, self.provider.cinder.volumes.get(volume_id))
         except CinderNotFound:
-            log.exception("CinderNotFound exception raised.")
+            log.debug("Volume %s was not found.", volume_id)
             return None
 
     def find(self, name, limit=None, marker=None):
@@ -396,7 +396,7 @@ class OpenStackSnapshotService(BaseSnapshotService):
                 self.provider,
                 self.provider.cinder.volume_snapshots.get(snapshot_id))
         except CinderNotFound:
-            log.exception("CinderNotFound exception raised.")
+            log.debug("Snapshot %s was not found.", snapshot_id)
             return None
 
     def find(self, name, limit=None, marker=None):
@@ -462,7 +462,7 @@ class OpenStackBucketService(BaseBucketService):
                                    next((c for c in container_list
                                          if c['name'] == bucket_id), None))
         else:
-            log.exception("OpenStack Bucket does not exist.")
+            log.debug("Bucket %s was not found.", bucket_id)
             return None
 
     def find(self, name, limit=None, marker=None):
@@ -735,6 +735,7 @@ class OpenStackInstanceService(BaseInstanceService):
             os_instance = self.provider.nova.servers.get(instance_id)
             return OpenStackInstance(self.provider, os_instance)
         except NovaNotFound:
+            log.debug("Instance %s was not found.", instance_id)
             return None