Merge pull request #460 from globocom/develop

Develop

Author: renan-lopes-rodrigues

networkapi/api_interface/facade.py

@@ -290,13 +290,21 @@ def get_interface_by_ids(interface_ids):
 
 
 def generate_delete_file(user, equip_id, interface_list, channel):
+
+    log.info("generate_delete_file equip_id:%s interface_list:%s channel:%s", equip_id, interface_list, channel)
+
     try:
         INTERFACE_CONFIG_TOAPPLY_REL_PATH = get_variable(
             'interface_config_toapply_rel_path')
         INTERFACE_CONFIG_FILES_PATH = get_variable(
             'interface_config_files_path')
         TEMPLATE_REMOVE_CHANNEL = get_variable('template_remove_channel')
         TEMPLATE_REMOVE_INTERFACE = get_variable('template_remove_interface')
+
+        log.debug('INTERFACE_CONFIG_TOAPPLY_REL_PATH:%s', INTERFACE_CONFIG_TOAPPLY_REL_PATH)
+        log.debug('INTERFACE_CONFIG_FILES_PATH:%s', INTERFACE_CONFIG_FILES_PATH)
+        log.debug('TEMPLATE_REMOVE_CHANNEL:%s', TEMPLATE_REMOVE_CHANNEL)
+        log.debug('TEMPLATE_REMOVE_INTERFACE:%s', TEMPLATE_REMOVE_INTERFACE)
     except ObjectDoesNotExist:
         raise var_exceptions.VariableDoesNotExistException(
             'Erro buscando a variável INTERFACE_CONFIG_TEMPLATE_PATH,'
@@ -350,9 +358,12 @@ def generate_delete_file(user, equip_id, interface_list, channel):
 
 def delete_channel(user, equip_id, interface_list, channel):
 
+    log.info('delete_channel equip_id:%s interface_list:%s channel:%s', equip_id, interface_list, channel)
+
     file_to_deploy = generate_delete_file(
         user, equip_id, interface_list, channel)
 
+    log.debug('file_to_deploy: %s', file_to_deploy)
     # TODO Deploy config file
     try:
         lockvar = LOCK_EQUIPMENT % (equip_id)
@@ -510,6 +521,7 @@ def _load_template_file(equipment_id, template_type):
 
     filename_in = INTERFACE_CONFIG_TEMPLATE_PATH + \
         equipment_template.roteiro.roteiro
+    log.debug("filename_in: %s", filename_in)
 
     # Read contents from file
     try:

networkapi/interface/resource/InterfaceChannelResource.py

@@ -277,11 +277,15 @@ def handle_get(self, request, user, *args, **kwargs):
             return self.response_error(1)
 
     def handle_delete(self, request, user, *args, **kwargs):
-        """Trata uma requisição DELETE para excluir um port channel
-            URL: /channel/delete/<channel_name>/<interface_id>
+        """
+            Delete port channel from interface id (table 'interfaces'), ex.: 
+            DELETE /channel/delete/73886/
+
+            Not tested:
+            DELETE /channel/delete/<channel_name>/<interface_id>
         """
         try:
-            self.log.info('Delete Channel')
+            self.log.debug('Delete Channel request:%s', request)
 
             # User permission
             if not has_perm(user, AdminPermission.EQUIPMENT_MANAGEMENT, AdminPermission.WRITE_OPERATION):
@@ -290,30 +294,39 @@ def handle_delete(self, request, user, *args, **kwargs):
                 raise UserNotAuthorizedError(None)
 
             interface_id = kwargs.get('channel_name')
+            self.log.info('interface_id: %s', interface_id)
             interface = Interface.get_by_pk(int(interface_id))
             equip_list = []
 
+            # Getting port channel
             try:
                 interface.channel.id
                 channel = interface.channel
             except:
                 channel = interface.ligacao_front.channel
                 pass
+            self.log.debug('channel id:%s name:%s', channel.id, channel)
+
+            # Getting all interfaces used by port channel
             try:
                 interfaces = Interface.objects.all().filter(channel__id=channel.id)
             except:
                 return self.response(dumps_networkapi({}))
+            self.log.debug('interfaces: %s', interfaces)
 
+            # Getting all equipment from interfaces (switches, ex.: LF-CM-AH18-1 and LF-CM-AH18-2)
             for i in interfaces:
                 equip_list.append(i.equipamento.id)
             equip_list = set(equip_list)
             equip_dict = dict()
+            self.log.debug('equip_list: %s', equip_list)
             for e in equip_list:
                 equip_dict[str(e)] = interfaces.filter(equipamento__id=e)
 
             tipo = TipoInterface()
             tipo = tipo.get_by_name('access')
 
+            # For each equipment (leaf), remove port channel
             for e in equip_dict:
                 for i in equip_dict.get(e):
                     try: