Merge pull request #410 from globocom/develop

changed algorithm to get all 4 ips
globocom · Jul 24, 2024 · 9bd6393 · 9bd6393
2 parents 5fa02b1 + f347118
commit 9bd6393
Showing 1 changed file with 38 additions and 9 deletions.
diff --git a/networkapi/api_rack/provision.py b/networkapi/api_rack/provision.py
@@ -316,7 +316,6 @@ def spine_provision(self, rack, equips):
         log.debug(zip(equips_sorted[:2], [0, 2], [0, 1]))
 
         ASLEAF[numero_rack].append(BASE_AS_LFS + numero_rack)
-        log.debug(IPLEAFipv4)
 
         for equip, spn, j in zip(equips_sorted[:2], [0, 2], [0, 1]):
             variablestochangeleaf1["IPLEAFSP1IPV4"] = str(IPLEAFipv4[numero_rack][spn])
@@ -417,21 +416,51 @@ def spine_provision(self, rack, equips):
                         variablestochangespine1["VLANBORDA2CACHOSLEAF"] = str(vlanBOCA[spine_num])
                         variablestochangespine1["VLANBORDA2CACHOSB"] = str(vlanBOCAB[spine_num])
                         variablestochangespine1["VLANFE2LEAF"] = str(vlanFE[spine_num])
-                        variablestochangespine1["IPSPI2NEIPV6"] = str(IPSPINEipv6[numero_rack][spine_num])
-                        variablestochangespine1["IPSPI2NEIPV4"] = str(IPSPINEipv4[numero_rack][spine_num])
+
+                        counter = 1
+                        for ipv6 in IPSPINEipv6[numero_rack]:
+                            variablestochangespine1[f'IPSPINE{counter}IPV6'] = ipv6
+                            variablestochangespine1[f"IPNEIGHLEAF{counter}IPV6"] = str(IPLEAFipv6[numero_rack][counter -1])
+
+                            counter += 1
+
+                        counter = 1
+                        for ipv4 in IPSPINEipv4[numero_rack]:
+                            variablestochangespine1[f'IPSPINE{counter}IPV4'] = str(ipv6)
+                            variablestochangespine1[f"IPNEIGHLEAF{counter}IPV4"] = str(IPLEAFipv4[numero_rack][counter -1])
+
+                            counter += 1
+
+                        # variablestochangespine1["IPSPI2NEIPV6"] = str(IPSPINEipv6[numero_rack][spine_num])
+                        # variablestochangespine1["IPSPI2NEIPV4"] = str(IPSPINEipv4[numero_rack][spine_num])
                         variablestochangespine1["VLANBE2LEAF"] = str(vlanBE[spine_num])
-                        variablestochangespine1["IPNEIGHLEAF2IPV4"] = str(IPLEAFipv4[numero_rack][spine_num])
-                        variablestochangespine1["IPNEIGHLEAF2IPV6"] = str(IPLEAFipv6[numero_rack][spine_num])
+                        # variablestochangespine1["IPNEIGHLEAF2IPV4"] = str(IPLEAFipv4[numero_rack][spine_num])
+                        # variablestochangespine1["IPNEIGHLEAF2IPV6"] = str(IPLEAFipv6[numero_rack][spine_num])
                     elif spine_num == 2:
                         variablestochangespine1["VLANBORDA2LEAF"] = str(vlanBO[spine_num - 2])
                         variablestochangespine1["VLANBORDA2CACHOSLEAF"] = str(vlanBOCA[spine_num - 2])
                         variablestochangespine1["VLANBORDA2CACHOSB"] = str(vlanBOCAB[spine_num - 2])
                         variablestochangespine1["VLANFE2LEAF"] = str(vlanFE[spine_num - 2])
-                        variablestochangespine1["IPSPI2NEIPV6"] = str(IPSPINEipv6[numero_rack][spine_num - 2])
-                        variablestochangespine1["IPSPI2NEIPV4"] = str(IPSPINEipv4[numero_rack][spine_num - 2])
+                        counter = 1
+                        for ipv6 in IPSPINEipv6[numero_rack]:
+                            variablestochangespine1[f'IPSPINE{counter}IPV6'] = str(ipv6)
+                            variablestochangespine1[f"IPNEIGHLEAF{counter}IPV6"] = str(IPLEAFipv6[numero_rack][counter - 1])
+                            counter += 1
+
+                        counter = 1
+                        for ipv4 in IPSPINEipv4[numero_rack]:
+                            variablestochangespine1[f'IPSPINE{counter}IPV4'] = str(ipv6)
+                            variablestochangespine1[f"IPNEIGHLEAF{counter}IPV4"] = str(IPLEAFipv4[numero_rack][counter - 1])
+
+
+                            counter += 1
+                        # variablestochangespine1["IPSPI2NEIPV6"] = str(IPSPINEipv6[numero_rack][spine_num - 2])
+                        # variablestochangespine1["IPSPI2NEIPV4"] = str(IPSPINEipv4[numero_rack][spine_num - 2])
                         variablestochangespine1["VLANBE2LEAF"] = str(vlanBE[spine_num - 2])
-                        variablestochangespine1["IPNEIGHLEAF2IPV4"] = str(IPLEAFipv4[numero_rack][spine_num - 2])
-                        variablestochangespine1["IPNEIGHLEAF2IPV6"] = str(IPLEAFipv6[numero_rack][spine_num - 2])
+                        # variablestochangespine1["IPNEIGHLEAF2IPV4"] = str(IPLEAFipv4[numero_rack][spine_num - 2])
+                        # variablestochangespine1["IPNEIGHLEAF2IPV6"] = str(IPLEAFipv6[numero_rack][spine_num - 2])
+
+                    #### END to Berrini Block #####
 
                     variablestochangespine1["IPNEIGHLEAFIPV4"] = str(IPLEAFipv4[numero_rack][spine_num - 1])
                     variablestochangespine1["IPNEIGHLEAFIPV6"] = str(IPLEAFipv6[numero_rack][spine_num - 1])