Merge remote-tracking branch 'upstream/OL7_refactor_fix' into deploy_nov

globocom · Nov 13, 2018 · f7c9a6a · f7c9a6a
2 parents bf17c71 + 3d01d18
commit f7c9a6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/networkapi/ip/models.py b/networkapi/ip/models.py
@@ -64,6 +64,8 @@
 from networkapi.util.geral import get_app
 
 
+log = logging.getLogger(__name__)
+
 class NetworkIPv4Error(Exception):
 
     """Generic exception for everything related to NetworkIPv4."""
@@ -745,7 +747,6 @@ def create_v3(self, networkv4, locks_used=[], force=False):
         try:
             if self.oct1 is None and self.oct2 is None and \
                     self.oct3 is None and self.oct4 is None:
-
                 # Allocate network for vlan with prefix(optional)
                 try:
                     self.allocate_network_v3(networkv4.get('vlan'),

diff --git a/networkapi/vlan/models.py b/networkapi/vlan/models.py
@@ -1066,7 +1066,6 @@ def create_v3(self, vlan, user):
 
                 netv6_obj.create_v3(dict_net, locks_used=locks_name)
         except Exception, e:
-
             raise VlanErrorV3(e)
         finally:
             # Destroy locks