Merge pull request #478 from globocom/develop

Develop

Author: Malinoski

networkapi/api_channel/facade.py

@@ -61,7 +61,7 @@ def create(self, data):
         envs_vlans = data.get('envs_vlans')
 
         ### Verify if channel number is greater than 0 and smaller or equal to 4096
-        if int(nome) > 4096 or int(nome) <=1 :
+        if int(nome) > 4096 or int(nome) <1 :
             log.error("Channel %s must be between 0 and 4097." % nome)
             raise InterfaceError(
                 "Channel %s must be between 0 and 4097." % nome

networkapi/plugins/Netconf/plugin.py

@@ -204,14 +204,14 @@ def exec_command(self, command, success_regex='', invalid_regex=None, error_rege
             )
 
             if response.status_code != 200:
-                raise Exception
+                raise Exception(json.loads(response.text).get("detail", "Unknown error at netconf microservice"))
 
             result_message = "Configuration was executed successfully on {}.".format(self.equipment_access.fqdn)
             log.info(result_message)
             return result_message
 
         except Exception as e:
-            message = "Error while excute netconf command on equipment %s" % self.equipment_access.fqdn
+            message = "Error while excute netconf command on equipment %s: %s" % (self.equipment_access.fqdn, e)
             log.error(message)
             log.error(e)