Merge pull request #425 from globocom/develop

fixed

Author: renan-lopes-rodrigues

networkapi/api_rack/provision.py

@@ -427,8 +427,8 @@ def spine_provision(self, rack, equips):
 
                     ### TO BERRINI
                     if spine_num == 1:
-                        variablestochangespine1["DESCRIPTION1CONNECT"] = equips_sorted[0].get("nome")
-                        variablestochangespine1["DESCRIPTION2CONNECT"] = equips_sorted[1].get("nome")
+                        # variablestochangespine1["DESCRIPTION1CONNECT"] = equips_sorted[0].get("nome")
+                        # variablestochangespine1["DESCRIPTION2CONNECT"] = equips_sorted[1].get("nome")
                         variablestochangespine1["VLANBORDA2LEAF"] = str(vlanBO[spine_num])
                         variablestochangespine1["VLANBORDA2CACHOSLEAF"] = str(vlanBOCA[spine_num])
                         variablestochangespine1["VLANBORDA2CACHOSB"] = str(vlanBOCAB[spine_num])
@@ -454,8 +454,6 @@ def spine_provision(self, rack, equips):
                         # variablestochangespine1["IPNEIGHLEAF2IPV4"] = str(IPLEAFipv4[numero_rack][spine_num])
                         # variablestochangespine1["IPNEIGHLEAF2IPV6"] = str(IPLEAFipv6[numero_rack][spine_num])
                     elif spine_num == 2:
-                        variablestochangespine1["DESCRIPTION1CONNECT"] = equips_sorted[1].get("nome")
-                        variablestochangespine1["DESCRIPTION2CONNECT"] = equips_sorted[0].get("nome")
                         variablestochangespine1["VLANBORDA2LEAF"] = str(vlanBO[spine_num - 2])
                         variablestochangespine1["VLANBORDA2CACHOSLEAF"] = str(vlanBOCA[spine_num - 2])
                         variablestochangespine1["VLANBORDA2CACHOSB"] = str(vlanBOCAB[spine_num - 2])
@@ -487,6 +485,8 @@ def spine_provision(self, rack, equips):
                         #     # "DESCRIPTION{}CONNECT"
 
                             # e_counter += 1
+                    variablestochangespine1["DESCRIPTION1CONNECT"] = equips_sorted[1].get("nome")
+                    variablestochangespine1["DESCRIPTION2CONNECT"] = equips_sorted[0].get("nome")
                     #### END to Berrini Block #####
 
                     variablestochangespine1["IPNEIGHLEAFIPV4"] = str(IPLEAFipv4[numero_rack][spine_num - 1])