Second sweep through refactored services

cloudbridge/cloud/base/services.py

@@ -134,7 +134,7 @@ class BaseKeyPairService(
         return self.dispatch(self, "provider.security.key_pairs.list",
                              limit=limit, marker=marker)
 
-    def create(self, name, location=None):
+    def create(self, name, public_key_material=None):
         """
         Create a new key pair.
 
@@ -147,7 +147,7 @@ class BaseKeyPairService(
         """
         BaseKeyPair.assert_valid_resource_name(name)
         return self.dispatch(self, "provider.security.key_pairs.create",
-                             name, location=location)
+                             name,  public_key_material=public_key_material)
 
     def delete(self, key_pair_id):
         """
@@ -211,7 +211,7 @@ class BaseVMFirewallService(
         """
         BaseVMFirewall.assert_valid_resource_label(label)
         return self.dispatch(self, "provider.security.vm_firewalls.create",
-                             label, self, label, network, description)
+                             label, network, description)
 
     def delete(self, vm_firewall_id):
         """

cloudbridge/cloud/providers/aws/services.py

@@ -115,8 +115,6 @@ class AWSKeyPairService(BaseKeyPairService):
     @implement(event_pattern="provider.security.key_pairs.create",
                priority=BaseKeyPairService.STANDARD_EVENT_PRIORITY)
     def _create(self, name, public_key_material=None):
-        log.debug("Creating Key Pair Service %s", name)
-        AWSKeyPair.assert_valid_resource_name(name)
         private_key = None
         if not public_key_material:
             public_key_material, private_key = cb_helpers.generate_key_pair()

cloudbridge/cloud/providers/azure/services.py

@@ -199,8 +199,6 @@ class AzureKeyPairService(BaseKeyPairService):
     @implement(event_pattern="provider.security.key_pairs.create",
                priority=BaseKeyPairService.STANDARD_EVENT_PRIORITY)
     def _create(self, name, public_key_material=None):
-        AzureKeyPair.assert_valid_resource_name(name)
-
         key_pair = self.get(name)
 
         if key_pair:

cloudbridge/cloud/providers/gce/services.py

@@ -123,8 +123,6 @@ class GCEKeyPairService(BaseKeyPairService):
     @implement(event_pattern="provider.security.key_pairs.create",
                priority=BaseKeyPairService.STANDARD_EVENT_PRIORITY)
     def _create(self, name, public_key_material=None):
-        GCEKeyPair.assert_valid_resource_name(name)
-
         private_key = None
         if not public_key_material:
             public_key_material, private_key = cb_helpers.generate_key_pair()

cloudbridge/cloud/providers/openstack/services.py

@@ -181,9 +181,6 @@ class OpenStackKeyPairService(BaseKeyPairService):
     @implement(event_pattern="provider.security.key_pairs.create",
                priority=BaseKeyPairService.STANDARD_EVENT_PRIORITY)
     def _create(self, name, public_key_material=None):
-        log.debug("Creating a new key pair with the name: %s", name)
-        OpenStackKeyPair.assert_valid_resource_name(name)
-
         existing_kp = self.find(name=name)
         if existing_kp:
             raise DuplicateResourceException(