resource fixes

cloudbridge/cloud/providers/aws/resources.py

@@ -517,6 +517,7 @@ class AWSSnapshot(BaseSnapshot):
     # ApiReference-cmd-DescribeSnapshots.html
     SNAPSHOT_STATE_MAP = {
         'pending': SnapshotState.PENDING,
+        'deleting': SnapshotState.PENDING,
         'completed': SnapshotState.AVAILABLE,
         'error': SnapshotState.ERROR
     }
@@ -624,7 +625,7 @@ class AWSKeyPair(BaseKeyPair):
         :return: Unencrypted private key or ``None`` if not available.
 
         """
-        return self._key_pair.material
+        return self._key_pair.key_material
 
 
 class AWSSecurityGroup(BaseSecurityGroup):

cloudbridge/cloud/providers/aws/services.py

@@ -280,11 +280,15 @@ class AWSVolumeService(BaseVolumeService):
         zone_id = zone.id if isinstance(zone, PlacementZone) else zone
         snapshot_id = snapshot.id if isinstance(
             snapshot, AWSSnapshot) and snapshot else snapshot
-        res = self.iface.create('create_volume',
-                                Size=size,
-                                Iops=iops,
-                                AvailabilityZone=zone_id,
-                                SnapshotId=snapshot_id)
+        params = {
+            'Size': size,
+            'AvailabilityZone': zone_id
+        }
+        if iops:
+            params['Iops'] = iops
+        if snapshot_id:
+            params['SnapshotId'] = snapshot_id
+        res = self.iface.create('create_volume', **params)
         res.name = name
         if res.description:
             res.description = description