Merge pull request #110 from napalm-automation/develop

Release 0.6.2

Author: mirceaulinic

napalm_junos/templates/delete_users.j2

@@ -1,17 +1,23 @@
 system {
   login {
     {%- for user_name, user_details in users.items() -%}
-      {%- if user_details -%}
+      {%- if user_details and (user_details.get('password') and user_details.get('sshkeys')) -%}
       user {{user_name}} {
           authentication {
             {%- if user_details.get('password') -%}
             delete: encrypted-password "{{user_details.password}}";
             {%- endif -%}
             {%- if user_details.get('sshkeys') -%}
               {%- for sshkey in user_details.sshkeys -%}
+                {%- if sshkey.split()[0] == 'ssh-dss' -%}
                 delete: {{ sshkey.split()[0] }} "{{ sshkey }}";
+                {%- else -%}
+                delete: ssh-dss "{{ sshkey }}";
+                {%- endif -%}
               {%- endfor -%}
             {%- endif -%}
+          }
+      }
       {%- else -%}
       delete: user {{user_name}};
       {% endif -%}

napalm_junos/templates/set_users.j2

@@ -2,22 +2,28 @@ system {
   login {
     {%- for user_name, user_details in users.items() -%}
     user {{user_name}} {
+      {%- if user_details.get('password') or user_details.get('sshkeys') -%}
       authentication {
         {%- if user_details.get('password') -%}
         plain-text-password "{{user_details.password}}";
         {%- endif -%}
         {%- if user_details.get('sshkeys') -%}
           {%- for sshkey in user_details.sshkeys -%}
+            {%- if sshkey.split()[0] == 'ssh-dss' -%}
+            ssh-dsa "{{ sshkey }}";
+            {%- else -%}
             {{ sshkey.split()[0] }} "{{ sshkey }}";
+            {%- endif -%}
           {%- endfor -%}
         {%- endif -%}
       }
+      {%- endif -%}
       {% set user_level = user_details.level|default(0) -%}
       {%- if user_level == 15 -%}
         class super-user;
-      {%- elif user_level == 5 -%}
+      {%- elif user_level < 15 and user_level >= 5 -%}
         class operator;
-      {%- elif user_level == 1 -%}
+      {%- elif user_level < 5 and user_level >=1 -%}
         class read-only;
       {% elif user_level == 0 -%}
         class unauthorized;

setup.py

@@ -12,7 +12,7 @@
 
 setup(
     name="napalm-junos",
-    version="0.6.1",
+    version="0.6.2",
     packages=find_packages(),
     author="David Barroso, Mircea Ulinic",
     author_email="[email protected], [email protected]",