event_pattern to event in dispatch

cloudbridge/cloud/base/services.py

@@ -117,7 +117,7 @@ class BaseVMFirewallRuleService(BasePageableObjectMixin,
     def provider(self):
         return self._provider
 
-    @dispatch(event_pattern="provider.security.vm_firewall_rules.get",
+    @dispatch(event="provider.security.vm_firewall_rules.get",
               priority=BaseCloudService.STANDARD_EVENT_PRIORITY)
     def get(self, firewall, rule_id):
         matches = [rule for rule in firewall.rules if rule.id == rule_id]
@@ -126,7 +126,7 @@ class BaseVMFirewallRuleService(BasePageableObjectMixin,
         else:
             return None
 
-    @dispatch(event_pattern="provider.security.vm_firewall_rules.find",
+    @dispatch(event="provider.security.vm_firewall_rules.find",
               priority=BaseCloudService.STANDARD_EVENT_PRIORITY)
     def find(self, firewall, **kwargs):
         obj_list = firewall.rules
@@ -388,7 +388,7 @@ class BaseFloatingIPService(FloatingIPService):
     def provider(self):
         return self._provider
 
-    @dispatch(event_pattern="provider.networking.floating_ips.find",
+    @dispatch(event="provider.networking.floating_ips.find",
               priority=BaseCloudService.STANDARD_EVENT_PRIORITY)
     def find(self, gateway, **kwargs):
         obj_list = gateway.floating_ips

cloudbridge/cloud/providers/aws/services.py

@@ -205,7 +205,7 @@ class AWSVMFirewallRuleService(BaseVMFirewallRuleService):
     def __init__(self, provider):
         super(AWSVMFirewallRuleService, self).__init__(provider)
 
-    @dispatch(event_pattern="provider.security.vm_firewall_rules.list",
+    @dispatch(event="provider.security.vm_firewall_rules.list",
               priority=BaseVMFirewallRuleService.STANDARD_EVENT_PRIORITY)
     def list(self, firewall, limit=None, marker=None):
         # pylint:disable=protected-access
@@ -219,7 +219,7 @@ class AWSVMFirewallRuleService(BaseVMFirewallRuleService):
         return ClientPagedResultList(self.provider, rules,
                                      limit=limit, marker=marker)
 
-    @dispatch(event_pattern="provider.security.vm_firewall_rules.create",
+    @dispatch(event="provider.security.vm_firewall_rules.create",
               priority=BaseVMFirewallRuleService.STANDARD_EVENT_PRIORITY)
     def create(self, firewall,  direction, protocol=None, from_port=None,
                to_port=None, cidr=None, src_dest_fw=None):
@@ -253,7 +253,7 @@ class AWSVMFirewallRuleService(BaseVMFirewallRuleService):
             else:
                 raise ec2e
 
-    @dispatch(event_pattern="provider.security.vm_firewall_rules.delete",
+    @dispatch(event="provider.security.vm_firewall_rules.delete",
               priority=BaseVMFirewallRuleService.STANDARD_EVENT_PRIORITY)
     def delete(self, firewall, rule):
         ip_perm_entry = rule._construct_ip_perms(
@@ -1168,7 +1168,7 @@ class AWSGatewayService(BaseGatewayService):
                                   cb_resource=AWSInternetGateway,
                                   boto_collection_name='internet_gateways')
 
-    @dispatch(event_pattern="provider.networking.gateways.get_or_create",
+    @dispatch(event="provider.networking.gateways.get_or_create",
               priority=BaseGatewayService.STANDARD_EVENT_PRIORITY)
     def get_or_create(self, network):
         network_id = network.id if isinstance(
@@ -1189,7 +1189,7 @@ class AWSGatewayService(BaseGatewayService):
         cb_gateway._gateway.attach_to_vpc(VpcId=network_id)
         return cb_gateway
 
-    @dispatch(event_pattern="provider.networking.gateways.delete",
+    @dispatch(event="provider.networking.gateways.delete",
               priority=BaseGatewayService.STANDARD_EVENT_PRIORITY)
     def delete(self, network, gateway):
         gw = (gateway if isinstance(gateway, AWSInternetGateway)
@@ -1201,7 +1201,7 @@ class AWSGatewayService(BaseGatewayService):
         except ClientError as e:
             log.warn("Error deleting gateway {0}: {1}".format(self.id, e))
 
-    @dispatch(event_pattern="provider.networking.gateways.list",
+    @dispatch(event="provider.networking.gateways.list",
               priority=BaseGatewayService.STANDARD_EVENT_PRIORITY)
     def list(self, network, limit=None, marker=None):
         log.debug("Listing current AWS internet gateways for net %s.",
@@ -1218,19 +1218,19 @@ class AWSFloatingIPService(BaseFloatingIPService):
                                   cb_resource=AWSFloatingIP,
                                   boto_collection_name='vpc_addresses')
 
-    @dispatch(event_pattern="provider.networking.floating_ips.get",
+    @dispatch(event="provider.networking.floating_ips.get",
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)
     def get(self, gateway, fip_id):
         log.debug("Getting AWS Floating IP Service with the id: %s", fip_id)
         return self.svc.get(fip_id)
 
-    @dispatch(event_pattern="provider.networking.floating_ips.list",
+    @dispatch(event="provider.networking.floating_ips.list",
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)
     def list(self, gateway, limit=None, marker=None):
         log.debug("Listing all floating IPs under gateway %s", gateway)
         return self.svc.list(limit=limit, marker=marker)
 
-    @dispatch(event_pattern="provider.networking.floating_ips.create",
+    @dispatch(event="provider.networking.floating_ips.create",
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)
     def create(self, gateway):
         log.debug("Creating a floating IP under gateway %s", gateway)
@@ -1240,7 +1240,7 @@ class AWSFloatingIPService(BaseFloatingIPService):
             self.provider,
             self.provider.ec2_conn.VpcAddress(ip.get('AllocationId')))
 
-    @dispatch(event_pattern="provider.networking.floating_ips.delete",
+    @dispatch(event="provider.networking.floating_ips.delete",
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)
     def delete(self, gateway, fip):
         if isinstance(fip, AWSFloatingIP):

cloudbridge/cloud/providers/azure/services.py

@@ -154,7 +154,7 @@ class AzureVMFirewallRuleService(BaseVMFirewallRuleService):
     def __init__(self, provider):
         super(AzureVMFirewallRuleService, self).__init__(provider)
 
-    @dispatch(event_pattern="provider.security.vm_firewall_rules.list",
+    @dispatch(event="provider.security.vm_firewall_rules.list",
               priority=BaseVMFirewallRuleService.STANDARD_EVENT_PRIORITY)
     def list(self, firewall, limit=None, marker=None):
         # Filter out firewall rules with priority < 3500 because values
@@ -167,7 +167,7 @@ class AzureVMFirewallRuleService(BaseVMFirewallRuleService):
         return ClientPagedResultList(self._provider, rules,
                                      limit=limit, marker=marker)
 
-    @dispatch(event_pattern="provider.security.vm_firewall_rules.create",
+    @dispatch(event="provider.security.vm_firewall_rules.create",
               priority=BaseVMFirewallRuleService.STANDARD_EVENT_PRIORITY)
     def create(self, firewall, direction, protocol=None, from_port=None,
                to_port=None, cidr=None, src_dest_fw=None):
@@ -217,7 +217,7 @@ class AzureVMFirewallRuleService(BaseVMFirewallRuleService):
         firewall._vm_firewall.security_rules.append(result)
         return AzureVMFirewallRule(firewall, result)
 
-    @dispatch(event_pattern="provider.security.vm_firewall_rules.delete",
+    @dispatch(event="provider.security.vm_firewall_rules.delete",
               priority=BaseVMFirewallRuleService.STANDARD_EVENT_PRIORITY)
     def delete(self, firewall, rule):
         rule_id = rule.id if isinstance(rule, AzureVMFirewallRule) else rule
@@ -1305,12 +1305,12 @@ class AzureGatewayService(BaseGatewayService):
     def _gateway_singleton(self, network):
         return AzureInternetGateway(self._provider, None, network)
 
-    @dispatch(event_pattern="provider.networking.gateways.get_or_create",
+    @dispatch(event="provider.networking.gateways.get_or_create",
               priority=BaseGatewayService.STANDARD_EVENT_PRIORITY)
     def get_or_create(self, network):
         return self._gateway_singleton(network)
 
-    @dispatch(event_pattern="provider.networking.gateways.list",
+    @dispatch(event="provider.networking.gateways.list",
               priority=BaseGatewayService.STANDARD_EVENT_PRIORITY)
     def list(self, network, limit=None, marker=None):
         gws = [self._gateway_singleton(network)]
@@ -1318,7 +1318,7 @@ class AzureGatewayService(BaseGatewayService):
                                      gws,
                                      limit=limit, marker=marker)
 
-    @dispatch(event_pattern="provider.networking.gateways.delete",
+    @dispatch(event="provider.networking.gateways.delete",
               priority=BaseGatewayService.STANDARD_EVENT_PRIORITY)
     def delete(self, network, gateway):
         pass
@@ -1329,7 +1329,7 @@ class AzureFloatingIPService(BaseFloatingIPService):
     def __init__(self, provider):
         super(AzureFloatingIPService, self).__init__(provider)
 
-    @dispatch(event_pattern="provider.networking.floating_ips.get",
+    @dispatch(event="provider.networking.floating_ips.get",
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)
     def get(self, gateway, fip_id):
         log.debug("Getting Azure Floating IP container with the id: %s",
@@ -1337,7 +1337,7 @@ class AzureFloatingIPService(BaseFloatingIPService):
         fip = [fip for fip in self if fip.id == fip_id]
         return fip[0] if fip else None
 
-    @dispatch(event_pattern="provider.networking.floating_ips.list",
+    @dispatch(event="provider.networking.floating_ips.list",
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)
     def list(self, gateway, limit=None, marker=None):
         floating_ips = [AzureFloatingIP(self.provider, floating_ip,
@@ -1347,7 +1347,7 @@ class AzureFloatingIPService(BaseFloatingIPService):
         return ClientPagedResultList(self.provider, floating_ips,
                                      limit=limit, marker=marker)
 
-    @dispatch(event_pattern="provider.networking.floating_ips.create",
+    @dispatch(event="provider.networking.floating_ips.create",
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)
     def create(self, gateway):
         public_ip_parameters = {
@@ -1361,7 +1361,7 @@ class AzureFloatingIPService(BaseFloatingIPService):
             create_floating_ip(public_ip_name, public_ip_parameters)
         return AzureFloatingIP(self.provider, floating_ip, gateway.network_id)
 
-    @dispatch(event_pattern="provider.networking.floating_ips.delete",
+    @dispatch(event="provider.networking.floating_ips.delete",
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)
     def delete(self, gateway, fip):
         fip_id = fip if isinstance(fip, AzureFloatingIP) else fip

cloudbridge/cloud/providers/gce/services.py

@@ -228,7 +228,7 @@ class GCEVMFirewallRuleService(BaseVMFirewallRuleService):
         super(GCEVMFirewallRuleService, self).__init__(provider)
         self._dummy_rule = None
 
-    @dispatch(event_pattern="provider.security.vm_firewall_rules.list",
+    @dispatch(event="provider.security.vm_firewall_rules.list",
               priority=BaseVMFirewallRuleService.STANDARD_EVENT_PRIORITY)
     def list(self, firewall, limit=None, marker=None):
         rules = []
@@ -278,14 +278,14 @@ class GCEVMFirewallRuleService(BaseVMFirewallRuleService):
             return None
         return rules[0]
 
-    @dispatch(event_pattern="provider.security.vm_firewall_rules.create",
+    @dispatch(event="provider.security.vm_firewall_rules.create",
               priority=BaseVMFirewallRuleService.STANDARD_EVENT_PRIORITY)
     def create(self, firewall, direction, protocol, from_port=None,
                to_port=None, cidr=None, src_dest_fw=None):
         return self.create_with_priority(direction, protocol, 1000, from_port,
                                          to_port, cidr, src_dest_fw)
 
-    @dispatch(event_pattern="provider.security.vm_firewall_rules.delete",
+    @dispatch(event="provider.security.vm_firewall_rules.delete",
               priority=BaseVMFirewallRuleService.STANDARD_EVENT_PRIORITY)
     def delete(self, firewall, rule):
         rule = rule if isinstance(rule, GCEVMFirewallRule) else self.get(rule)
@@ -1505,17 +1505,17 @@ class GCEGatewayService(BaseGatewayService):
                     GCEGatewayService._DEFAULT_GATEWAY_NAME),
              'name': GCEGatewayService._DEFAULT_GATEWAY_NAME})
 
-    @dispatch(event_pattern="provider.networking.gateways.get_or_create",
+    @dispatch(event="provider.networking.gateways.get_or_create",
               priority=BaseGatewayService.STANDARD_EVENT_PRIORITY)
     def get_or_create(self, network):
         return self._default_internet_gateway
 
-    @dispatch(event_pattern="provider.networking.gateways.delete",
+    @dispatch(event="provider.networking.gateways.delete",
               priority=BaseGatewayService.STANDARD_EVENT_PRIORITY)
     def delete(self, network, gateway):
         pass
 
-    @dispatch(event_pattern="provider.networking.gateways.list",
+    @dispatch(event="provider.networking.gateways.list",
               priority=BaseGatewayService.STANDARD_EVENT_PRIORITY)
     def list(self, network, limit=None, marker=None):
         gws = [self._default_internet_gateway]
@@ -1529,14 +1529,14 @@ class GCEFloatingIPService(BaseFloatingIPService):
     def __init__(self, provider, gateway):
         super(GCEFloatingIPService, self).__init__(provider, gateway)
 
-    @dispatch(event_pattern="provider.networking.floating_ips.get",
+    @dispatch(event="provider.networking.floating_ips.get",
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)
     def get(self, gateway, floating_ip_id):
         fip = self.provider.get_resource('addresses', floating_ip_id)
         return (GCEFloatingIP(self.provider, gateway, fip)
                 if fip else None)
 
-    @dispatch(event_pattern="provider.networking.floating_ips.list",
+    @dispatch(event="provider.networking.floating_ips.list",
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)
     def list(self, gateway, limit=None, marker=None):
         max_result = limit if limit is not None and limit < 500 else 500
@@ -1557,7 +1557,7 @@ class GCEFloatingIPService(BaseFloatingIPService):
                                      response.get('nextPageToken'),
                                      False, data=ips)
 
-    @dispatch(event_pattern="provider.networking.floating_ips.create",
+    @dispatch(event="provider.networking.floating_ips.create",
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)
     def create(self, gateway):
         region_name = self.provider.region_name
@@ -1572,7 +1572,7 @@ class GCEFloatingIPService(BaseFloatingIPService):
         self.provider.wait_for_operation(response, region=region_name)
         return self.get(ip_name)
 
-    @dispatch(event_pattern="provider.networking.floating_ips.delete",
+    @dispatch(event="provider.networking.floating_ips.delete",
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)
     def delete(self, gateway, fip):
         fip = (fip if isinstance(fip, GCEFloatingIP)

cloudbridge/cloud/providers/openstack/services.py

@@ -263,7 +263,7 @@ class OpenStackVMFirewallRuleService(BaseVMFirewallRuleService):
     def __init__(self, provider, firewall):
         super(OpenStackVMFirewallRuleService, self).__init__(provider)
 
-    @dispatch(event_pattern="provider.security.vm_firewall_rules.list",
+    @dispatch(event="provider.security.vm_firewall_rules.list",
               priority=BaseVMFirewallRuleService.STANDARD_EVENT_PRIORITY)
     def list(self, firewall, limit=None, marker=None):
         # pylint:disable=protected-access
@@ -272,7 +272,7 @@ class OpenStackVMFirewallRuleService(BaseVMFirewallRuleService):
         return ClientPagedResultList(self.provider, rules,
                                      limit=limit, marker=marker)
 
-    @dispatch(event_pattern="provider.security.vm_firewall_rules.create",
+    @dispatch(event="provider.security.vm_firewall_rules.create",
               priority=BaseVMFirewallRuleService.STANDARD_EVENT_PRIORITY)
     def create(self, firewall, direction, protocol=None, from_port=None,
                to_port=None, cidr=None, src_dest_fw=None):
@@ -309,7 +309,7 @@ class OpenStackVMFirewallRuleService(BaseVMFirewallRuleService):
             else:
                 raise e
 
-    @dispatch(event_pattern="provider.security.vm_firewall_rules.delete",
+    @dispatch(event="provider.security.vm_firewall_rules.delete",
               priority=BaseVMFirewallRuleService.STANDARD_EVENT_PRIORITY)
     def delete(self, firewall, rule):
         rule_id = (rule.id if isinstance(rule, OpenStackVMFirewallRule)
@@ -1153,7 +1153,7 @@ class OpenStackGatewayService(BaseGatewayService):
             except Exception:
                 return False
 
-    @dispatch(event_pattern="provider.networking.gateways.get_or_create",
+    @dispatch(event="provider.networking.gateways.get_or_create",
               priority=BaseGatewayService.STANDARD_EVENT_PRIORITY)
     def get_or_create(self, network):
         """For OS, inet gtw is any net that has `external` property set."""
@@ -1164,12 +1164,12 @@ class OpenStackGatewayService(BaseGatewayService):
                 return OpenStackInternetGateway(self._provider, net)
         return None
 
-    @dispatch(event_pattern="provider.networking.gateways.delete",
+    @dispatch(event="provider.networking.gateways.delete",
               priority=BaseGatewayService.STANDARD_EVENT_PRIORITY)
     def delete(self, network, gateway):
         pass
 
-    @dispatch(event_pattern="provider.networking.gateways.list",
+    @dispatch(event="provider.networking.gateways.list",
               priority=BaseGatewayService.STANDARD_EVENT_PRIORITY)
     def list(self, network, limit=None, marker=None):
         log.debug("OpenStack listing of all current internet gateways")
@@ -1185,7 +1185,7 @@ class OpenStackFloatingIPService(BaseFloatingIPService):
     def __init__(self, provider, gateway):
         super(OpenStackFloatingIPService, self).__init__(provider, gateway)
 
-    @dispatch(event_pattern="provider.networking.floating_ips.get",
+    @dispatch(event="provider.networking.floating_ips.get",
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)
     def get(self, gateway, fip_id):
         try:
@@ -1195,7 +1195,7 @@ class OpenStackFloatingIPService(BaseFloatingIPService):
             log.debug("Floating IP %s not found.", fip_id)
             return None
 
-    @dispatch(event_pattern="provider.networking.floating_ips.list",
+    @dispatch(event="provider.networking.floating_ips.list",
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)
     def list(self, gateway, limit=None, marker=None):
         fips = [OpenStackFloatingIP(self.provider, fip)
@@ -1205,14 +1205,14 @@ class OpenStackFloatingIPService(BaseFloatingIPService):
         return ClientPagedResultList(self.provider, fips,
                                      limit=limit, marker=marker)
 
-    @dispatch(event_pattern="provider.networking.floating_ips.create",
+    @dispatch(event="provider.networking.floating_ips.create",
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)
     def create(self, gateway):
         return OpenStackFloatingIP(
             self.provider, self.provider.os_conn.network.create_ip(
                 floating_network_id=gateway.id))
 
-    @dispatch(event_pattern="provider.networking.floating_ips.delete",
+    @dispatch(event="provider.networking.floating_ips.delete",
               priority=BaseFloatingIPService.STANDARD_EVENT_PRIORITY)
     def delete(self, gateway, fip):
         if isinstance(fip, OpenStackFloatingIP):