Merge pull request #394 from marcusgc/master

Change error message text

Author: deivisonmarteleto

networkapi/api_neighbor/v4/exceptions.py

@@ -132,18 +132,18 @@ class LocalIpAndPeerGroupAtDifferentEnvironmentsException(APIException):
     status_code = status.HTTP_400_BAD_REQUEST
 
     def __init__(self, neighbor):
-        self.detail = u'LocalIp id = {} and PeerGroup id = {} belongs to ' \
-                      u'different Environments'. \
-            format(neighbor.local_ip, neighbor.peer_group)
+        self.detail = u'Not allowed to configure BGP neighbor using this Peer Group. ' \
+                      u'PeerGroup id = {} is not mapped to the environment of LocalIp id = {}' \
+            format(neighbor.peer_group, neighbor.local_ip)
 
 
 class NeighborDuplicatedException(APIException):
     status_code = status.HTTP_400_BAD_REQUEST
 
     def __init__(self, neighbor):
-        self.detail = u'It already exists Neighbor with LocalAsn id = {}, ' \
+        self.detail = u'Duplicated neighbor. A Neighbor with LocalAsn id = {}, ' \
                       u'LocalIp id = {}, RemoteAsn id = {} and ' \
-                      u'RemoteIp id = {}'.\
+                      u'RemoteIp id = {} already exists'.\
             format(neighbor.local_asn, neighbor.local_ip,
                    neighbor.remote_asn, neighbor.remote_ip)
 

networkapi/api_rack/facade.py

@@ -970,8 +970,8 @@ def allocate_env_vlan(user, rack_id):
     rack_env.spine_leaf_vlans_save()
 
     # leaf x leaf
-    rack_env.leaf_leaf_vlans_save()
     rack_env.leaf_leaf_envs_save()
+    rack_env.leaf_leaf_vlans_save()
 
     # producao/cloud
     rack_env.prod_environment_save()