Merge pull request #458 from globocom/develop

Develop

Author: renan-lopes-rodrigues

networkapi/api_deploy/facade.py

@@ -65,8 +65,13 @@ def _applyconfig(equipment, filename, equipment_access=None, source_server=None,
 
     # TODO: Handle exceptions from the following methods and generate response
     # for the caller
+    tipo_acesso = EquipamentoAcesso.search(None,
+                                        equipment,
+                                        ).uniqueResult()
+    if tipo_acesso is None:
+        return 'Equipment has no Access.'
 
-    equip_plugin = PluginFactory.factory(equipment)
+    equip_plugin = PluginFactory.factory(equipment, tipo_acesso=tipo_acesso.tipo_acesso.protocolo)
     equip_plugin.connect()
     equip_plugin.ensure_privilege_level()
     vrf = equip_plugin.equipment_access.vrf.internal_name if equip_plugin.equipment_access.vrf else None

networkapi/plugins/factory.py

@@ -35,6 +35,9 @@ def plugin_exists(cls, **kwargs):
     @classmethod
     def get_plugin(cls, **kwargs):
 
+        if 'tipo_acesso' in kwargs and kwargs.get('tipo_acesso') == 'netconf':
+            from .Netconf.plugin import GenericNetconf
+            return GenericNetconf
         if 'modelo' in kwargs:
             modelo = kwargs.get('modelo')
 
@@ -61,9 +64,9 @@ def get_plugin(cls, **kwargs):
 
         if 'marca' in kwargs:
             marca = kwargs.get('marca')
-            if re.search('HUAWEI', marca.upper(), re.DOTALL):
-                from .Netconf.plugin import GenericNetconf
-                return GenericNetconf
+            # if re.search('HUAWEI', marca.upper(), re.DOTALL):
+            #     from .Netconf.plugin import GenericNetconf
+            #     return GenericNetconf
             if re.search('F5', marca.upper(), re.DOTALL):
                 from .F5.Generic import Generic
                 return Generic