Merge pull request #482 from globocom/develop

Develop

Author: Malinoski

networkapi/api_deploy/facade.py

@@ -57,6 +57,8 @@ def _applyconfig(equipment, filename, equipment_access=None, source_server=None,
     Raises:
     """
 
+    log.info("Applying configuration in equipment {} with filename {}...".format(equipment, filename))
+
     if equipment.maintenance is True:
         return 'Equipment is in maintenance mode. No action taken.'
 
@@ -71,15 +73,18 @@ def _applyconfig(equipment, filename, equipment_access=None, source_server=None,
     # if tipo_acesso is None:
     #     return 'Equipment has no Access.'
 
-    equip_plugin = PluginFactory.factory(equipment)
-    equip_plugin.connect()
-    equip_plugin.ensure_privilege_level()
-    vrf = equip_plugin.equipment_access.vrf.internal_name if equip_plugin.equipment_access.vrf else None
-    equip_output = equip_plugin.copyScriptFileToConfig(filename, use_vrf=vrf)
-    equip_plugin.close()
-
-    return equip_output
-
+    try:
+        equip_plugin = PluginFactory.factory(equipment)
+        equip_plugin.connect()
+        equip_plugin.ensure_privilege_level()
+        vrf = equip_plugin.equipment_access.vrf.internal_name if equip_plugin.equipment_access.vrf else None
+        equip_output = equip_plugin.copyScriptFileToConfig(filename, use_vrf=vrf)
+        equip_plugin.close()
+
+        return equip_output
+    except Exception, e:
+        log.error("Error applying configuration in equipment {}: {}".format(equipment, e))
+        raise api_exceptions.NetworkAPIException(e)
 
 def create_file_from_script(script, prefix_name=''):
     """Creates a file with script content

networkapi/api_network/facade/v1.py

@@ -193,6 +193,8 @@ def remove_deploy_networkIPv4_configuration(user, networkipv4, equipment_list):
     Returns: List with status of equipments output
     """
 
+    log.debug("remove_deploy_networkIPv4_configuration")
+
     data = dict()
 
     # lock network id to prevent multiple requests to same id

networkapi/api_network/facade/v3/networkv4.py

@@ -160,6 +160,8 @@ def undeploy_networkipv4(network_id, user, force=False):
     Returns: List with status of equipments output
     """
 
+    log.debug('undeploy_networkipv4')
+
     try:
         netv4_obj = get_networkipv4_by_id(network_id)
 

networkapi/api_network/views/v1.py

@@ -371,7 +371,7 @@ def networkIPv4_deploy(request, network_id):
 
     except Exception, exception:
         log.error(exception)
-        raise api_exceptions.NetworkAPIException()
+        raise api_exceptions.NetworkAPIException(exception)
 
 
 @api_view(['GET'])