Deprecated alias correct order

cloudbridge/cloud/base/helpers.py

@@ -155,8 +155,8 @@ def rename_kwargs(func_name, kwargs, aliases):
             if new in kwargs:
                 raise TypeError('{} received both {} and {}'.format(
                     func_name, alias, new))
-                # Manually invoke the deprecated decorator with an empty lambda
-                # to signal deprecation
+            # Manually invoke the deprecated decorator with an empty lambda
+            # to signal deprecation
             deprecated(deprecated_in='1.1',
                        current_version=cloudbridge.__version__,
                        details='{} is deprecated, use {} instead'.format(

cloudbridge/cloud/providers/aws/services.py

@@ -135,7 +135,7 @@ class AWSVMFirewallService(BaseVMFirewallService):
     def list(self, limit=None, marker=None):
         return self.svc.list(limit=limit, marker=marker)
 
-    @cb_helpers.deprecated_alias(network='network_id')
+    @cb_helpers.deprecated_alias(network_id='network')
     def create(self, label, network=None, description=None):
         log.debug("Creating Firewall Service with the parameters "
                   "[label: %s id: %s description: %s]", label, network,

cloudbridge/cloud/providers/azure/services.py

@@ -66,7 +66,7 @@ class AzureVMFirewallService(BaseVMFirewallService):
                for fw in self.provider.azure_client.list_vm_firewall()]
         return ClientPagedResultList(self.provider, fws, limit, marker)
 
-    @cb_helpers.deprecated_alias(network='network_id')
+    @cb_helpers.deprecated_alias(network_id='network')
     def create(self, label, network=None, description=None):
         AzureVMFirewall.assert_valid_resource_label(label)
         name = AzureVMFirewall._generate_name_from_label(label, "cb-fw")

cloudbridge/cloud/providers/openstack/services.py

@@ -210,7 +210,7 @@ class OpenStackVMFirewallService(BaseVMFirewallService):
         return ClientPagedResultList(self.provider, firewalls,
                                      limit=limit, marker=marker)
 
-    @cb_helpers.deprecated_alias(network='network_id')
+    @cb_helpers.deprecated_alias(network_id='network')
     def create(self, label, network, description=None):
         OpenStackVMFirewall.assert_valid_resource_label(label)
         log.debug("Creating OpenStack VM Firewall with the params: "