Merge pull request #391 from marcusgc/master

fix typo for rack name identifier
globocom · Jun 20, 2024 · 49913bd · 49913bd
2 parents 06a87a4 + 788f669
commit 49913bd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/networkapi/ambiente/models.py b/networkapi/ambiente/models.py
@@ -2000,7 +2000,7 @@ def nextAvailableCIDR(self, subnets, network, network_mask=None):
         elif int(network_mask) == last_subnet.prefixlen:
             subnet = last_subnet.next()
         else:
-            subnet = NETADDR(str(last_subnet.next().ip) + "/" + network_mask)
+            subnet = NETADDR(str(last_subnet.next().ip) + "/" + str(network_mask))
             if not subnet.ip == subnet.network:
                 subnet = subnet.next()
 

diff --git a/networkapi/api_rack/rackenvironments.py b/networkapi/api_rack/rackenvironments.py
@@ -183,7 +183,7 @@ def leaf_leaf_vlans_save(self):
         log.debug("_create_lflf_vlans")
 
         env_lf = models_env.Ambiente.objects.filter(dcroom=int(self.rack.dcroom.id),
-                                                    grupo_l3__nome=str(self.rack.name),
+                                                    grupo_l3__nome=str(self.rack.nome),
                                                     ambiente_logico__nome="LEAF-LEAF")
         log.debug("Leaf-leaf environments: " + str(env_lf))
 

diff --git a/networkapi/settings.py b/networkapi/settings.py
@@ -71,7 +71,7 @@ def local_files(path):
 NETWORKAPI_DATABASE_PORT = os.getenv('NETWORKAPI_DATABASE_PORT', '3306')
 NETWORKAPI_DATABASE_OPTIONS = os.getenv(
     'NETWORKAPI_DATABASE_OPTIONS',
-    '{"init_command": "SET storage_engine=INNODB"}')
+    '{"init_command": "SET default_storage_engine=INNODB"}')
 
 # Configurações de banco de dados
 DATABASES = {