Merge pull request #94 from napalm-automation/develop

Release 0.7.2
napalm-automation · Oct 9, 2017 · 8bff2a7 · 8bff2a7
2 parents 3f32732 + fd9bac3
commit 8bff2a7
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ python:
 env:
     - ANSIBLE_VERSION=2.2
     - ANSIBLE_VERSION=2.3
+    - ANSIBLE_VERSION=2.4
 
 install:
     - pip install pylama
@@ -17,6 +18,7 @@ script:
     - cd tests
     - ./run_tests.sh
     - ./test_changelog.sh
+    - cd ..
 
 deploy:
   provider: pypi

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,12 @@
+0.7.2 (develop)
+=====
+
+0.7.1
+=====
+
+    - Add support for ``nxos_ssh`` driver
+    - Update unit tests to support Ansible 2.4
+
 0.7.0
 =====
 

diff --git a/napalm_ansible/napalm_cli.py b/napalm_ansible/napalm_cli.py
@@ -60,7 +60,7 @@
 
 def main():
     os_choices = ['eos', 'junos', 'iosxr', 'fortios',
-                  'ios', 'mock', 'nxos', 'panos', 'vyos', 'ros']
+                  'ios', 'mock', 'nxos', 'nxos_ssh', 'panos', 'vyos', 'ros']
     module = AnsibleModule(
         argument_spec=dict(
             hostname=dict(type='str', required=False, aliases=['host']),

diff --git a/napalm_ansible/napalm_get_facts.py b/napalm_ansible/napalm_get_facts.py
@@ -46,7 +46,8 @@
         description:
           - OS of the device
         required: False
-        choices: ['eos', 'junos', 'iosxr', 'fortios', 'ios', 'mock', 'nxos', 'panos', 'vyos']
+        choices: ['eos', 'junos', 'iosxr', 'fortios', 'ios', 'mock', 'nxos', 'nxos_ssh', 'panos',
+        'vyos']
     provider:
         description:
           - Dictionary which acts as a collection of arguments used to define the characteristics
@@ -153,7 +154,8 @@
 
 
 def main():
-    os_choices = ['eos', 'junos', 'iosxr', 'fortios', 'ios', 'mock', 'nxos', 'panos', 'vyos', 'ros']
+    os_choices = ['eos', 'junos', 'iosxr', 'fortios', 'ios', 'mock', 'nxos', 'nxos_ssh', 'panos',
+                  'vyos', 'ros']
     module = AnsibleModule(
         argument_spec=dict(
             hostname=dict(type='str', required=False, aliases=['host']),

diff --git a/napalm_ansible/napalm_install_config.py b/napalm_ansible/napalm_install_config.py
@@ -56,7 +56,8 @@
         description:
           - OS of the device
         required: False
-        choices: ['eos', 'junos', 'iosxr', 'fortios', 'ios', 'mock', 'nxos', 'panos', 'vyos']
+        choices: ['eos', 'junos', 'iosxr', 'fortios', 'ios', 'mock', 'nxos', 'nxos_ssh', 'panos',
+        'vyos']
     timeout:
         description:
           - Time in seconds to wait for the device to respond
@@ -176,7 +177,8 @@ def save_to_file(content, filename):
 
 
 def main():
-    os_choices = ['eos', 'junos', 'iosxr', 'fortios', 'ios', 'mock', 'nxos', 'panos', 'vyos', 'ros']
+    os_choices = ['eos', 'junos', 'iosxr', 'fortios', 'ios', 'mock', 'nxos',
+                  'nxos_ssh', 'panos', 'vyos', 'ros']
     module = AnsibleModule(
         argument_spec=dict(
             hostname=dict(type='str', required=False, aliases=['host']),

diff --git a/napalm_ansible/napalm_parse_yang.py b/napalm_ansible/napalm_parse_yang.py
@@ -64,7 +64,7 @@
           - OS of the device
         required: False
         choices: ['eos', 'junos', 'iosxr', 'fortios', 'ios', 'mock',
-                  'nxos', 'panos', 'vyos']
+                  'nxos', 'nxos_ssh', 'panos', 'vyos']
     provider:
         description:
           - Dictionary which acts as a collection of arguments used to define
@@ -252,7 +252,7 @@ def parse_from_device(module, os_choices):
 
 def main():
     os_choices = ['eos', 'junos', 'iosxr', 'fortios', 'ios',
-                  'mock', 'nxos', 'panos', 'vyos']
+                  'mock', 'nxos', 'nxos_ssh', 'panos', 'vyos']
     module = AnsibleModule(
         argument_spec=dict(
             hostname=dict(type='str', required=False, aliases=['host']),

diff --git a/napalm_ansible/napalm_validate.py b/napalm_ansible/napalm_validate.py
@@ -39,7 +39,7 @@
           - OS of the device.
         required: False
         choices: ['eos', 'junos', 'iosxr', 'fortios', 'ios', 'mock',
-                  'nxos', 'panos', 'vyos']
+                  'nxos', 'nxos_ssh', 'panos', 'vyos']
     provider:
         description:
           - Dictionary which acts as a collection of arguments used to define
@@ -204,7 +204,7 @@ def get_root_object(models):
 
 def main():
     os_choices = ['eos', 'junos', 'iosxr', 'fortios',
-                  'ios', 'mock', 'nxos', 'panos', 'vyos']
+                  'ios', 'mock', 'nxos', 'nxos_ssh', 'panos', 'vyos']
     module = AnsibleModule(
         argument_spec=dict(
             models=dict(type="list", required=False),

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setup(
     name="napalm-ansible",
-    version='0.7.0',
+    version='0.7.2',
     packages=["napalm_ansible"],
     author="David Barroso, Kirk Byers, Mircea Ulinic",
     author_email="[email protected], [email protected]",

diff --git a/tests/napalm_get_facts/get_facts_error.yaml b/tests/napalm_get_facts/get_facts_error.yaml
@@ -19,11 +19,11 @@
                 route_to:
                     protocol: static
                     destination: 8.8.8.8
-          register: napalm_facts             # store information here
+          register: test_napalm             # store information here
         - assert:
             that:
-                - napalm_facts.ansible_facts.napalm_facts.hostname == "localhost"
-                - napalm_facts.ansible_facts.napalm_interfaces.Ethernet1.mac_address == "08:00:27:C6:00:F0"
+                - test_napalm.ansible_facts.napalm_facts.hostname == "localhost"
+                - test_napalm.ansible_facts.napalm_interfaces.Ethernet1.mac_address == "08:00:27:C6:00:F0"
       rescue:
         - debug:
                 var: ansible_failed_result.msg

diff --git a/tests/napalm_get_facts/get_facts_not_implemented.yaml b/tests/napalm_get_facts/get_facts_not_implemented.yaml
@@ -20,11 +20,11 @@
                     protocol: static
                     destination: 8.8.8.8
             ignore_notimplemented: "{{ ignore_notimplemented }}"
-          register: napalm_facts             # store information here
+          register: test_napalm         # store information here
         - assert:
             that:
-                - napalm_facts.ansible_facts.napalm_facts.hostname == "localhost"
-                - napalm_facts.ansible_facts.napalm_interfaces.Ethernet1.mac_address == "08:00:27:C6:00:F0"
+                - test_napalm.ansible_facts.napalm_facts.hostname == "localhost"
+                - test_napalm.ansible_facts.napalm_interfaces.Ethernet1.mac_address == "08:00:27:C6:00:F0"
       rescue:
         - fail:
               msg: Whe shouldn't be here

diff --git a/tests/napalm_get_facts/get_facts_ok.yaml b/tests/napalm_get_facts/get_facts_ok.yaml
@@ -18,12 +18,12 @@
             route_to:
                 protocol: static
                 destination: 8.8.8.8
-      register: napalm_facts             # store information here
+      register: test_napalm
     - assert:
         that:
-            - napalm_facts.ansible_facts.napalm_facts.hostname == "localhost"
-            - "{{ '1.0.4.0/24' in napalm_facts.ansible_facts.napalm_route_to }}"
-            - napalm_facts.ansible_facts.napalm_interfaces.Ethernet1.mac_address == "08:00:27:C6:00:F0"
+            - test_napalm.ansible_facts.napalm_facts.hostname == "localhost"
+            - "{{ '1.0.4.0/24' in test_napalm.ansible_facts.napalm_route_to }}"
+            - test_napalm.ansible_facts.napalm_interfaces.Ethernet1.mac_address == "08:00:27:C6:00:F0"
     # Check direct facts
     - assert:
         that: