DNM: add zuul vyos testing

This is an example job to start testing vyos

Depends-On: ansible/ansible-zuul-jobs#34
Signed-off-by: Paul Belanger <[email protected]>

Author: pabelanger

.zuul.yaml

@@ -0,0 +1,9 @@
+- job:
+    name: network-vyos-test
+    parent: ansible-network-vyos-base
+    run: tests/foo.yaml
+
+- project:
+    check:
+      jobs:
+        - network-vyos-test

module_utils/vyos/facts/interfaces/interfaces.py

@@ -12,7 +12,7 @@
 from ansible.module_utils. \
      vyos.facts.base import FactsBase
 from re import findall, M
-import q
+
 
 class InterfacesFacts(FactsBase):
     """ The vyos interfaces fact class

requirements.txt

@@ -0,0 +1 @@
+ansible>=2.4.0

test-requirements.txt

@@ -1,2 +1,3 @@
+ara
 flake8
 yamllint

tests/ansible.cfg

@@ -0,0 +1,8 @@
+[defaults]
+callback_whitelist = profile_tasks, timer
+retry_files_enabled = false
+roles_path = ../..
+stdout_callback = yaml
+
+[ssh_connection]
+pipelining = true

tests/foo.yaml

@@ -0,0 +1,11 @@
+- hosts: controller
+  tasks:
+    - name: Bootstrap tox environment
+      args:
+        chdir: ~/src/github.com/ansible/network
+      shell: tox -v -evenv --notest
+
+    - name: Run ansible tests
+      args:
+        chdir: ~/src/github.com/ansible/network
+      shell: tox -evenv -- ansible-playbook -v -c network_cli tests/vyos/modules/interfaces/main.yaml

tests/vyos/modules/interfaces/deleted.yaml

@@ -8,8 +8,6 @@
   vyos_interfaces: &deleted
     config:
       - name: eth1
-
-      - name: eth2
     state: deleted
   register: result
 
@@ -21,7 +19,6 @@
       - "'delete interfaces ethernet {{ intf }} mtu' in result.commands"
   loop:
     - eth1
-    - eth2
   loop_control:
     loop_var: intf
 

tests/vyos/modules/interfaces/main.yaml

@@ -1,11 +1,9 @@
 ---
 - hosts: appliance
   gather_facts: true
-  gather_subset:
-    - net_configuration_interfaces
   tasks:
     - import_role:
-        name: ~/collections/network
+        name: network
 
     - include_tasks: "{{ item }}.yaml"
       loop:

tests/vyos/modules/interfaces/merged.yaml

@@ -13,15 +13,6 @@
         speed: auto
         duplex: auto
 
-      - name: eth2
-        description: "Configured by Ansible - Interface 2 (ADMIN DOWN)"
-        mtu: 600
-        enable: false
-
-      - name: eth3
-        description: "Configured by Ansible - Interface 3"
-        speed: 100
-        duplex: full
     state: merged
   register: result
 
@@ -34,12 +25,6 @@
       - "'set interfaces ethernet eth1 mtu \\'1200\\'' in result.commands"
       - "'set interfaces ethernet eth1 duplex \\'auto\\'' in result.commands"
       - "'set interfaces ethernet eth1 speed \\'auto\\'' in result.commands"
-      - "'set interfaces ethernet eth2 description \\'Configured by Ansible - Interface 2 (ADMIN DOWN)\\'' in result.commands"
-      - "'set interfaces ethernet eth2 mtu \\'600\\'' in result.commands"
-      - "'set interfaces ethernet eth2 disable' in result.commands"
-      - "'set interfaces ethernet eth3 description \\'Configured by Ansible - Interface 3\\'' in result.commands"
-      - "'set interfaces ethernet eth3 speed \\'100\\'' in result.commands"
-      - "'set interfaces ethernet eth3 duplex \\'full\\'' in result.commands"
 
 - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
   vyos_interfaces: *merged

tests/vyos/modules/interfaces/overridden.yaml

@@ -7,7 +7,7 @@
 - name: Overrides all device configuration with provided configuration
   vyos_interfaces: &overridden
     config:
-      - name: eth2
+      - name: eth1
         description: "Overridden by Ansible"
         mtu: 1500
     state: overridden
@@ -19,11 +19,8 @@
       - "'delete interfaces ethernet {{ item }} speed' in result.commands"
       - "'delete interfaces ethernet {{ item }} duplex' in result.commands"
       - "'delete interfaces ethernet {{ item }} mtu' in result.commands"
-      - "'set interfaces ethernet eth2 description \\'Overridden by Ansible\\'' in result.commands"
-      - "'set interfaces ethernet eth2 mtu \\'1500\\'' in result.commands"
   loop:
     - eth1
-    - eth3
 
 - name: Overrides all device configuration with provided configurations (IDEMPOTENT)
   vyos_interfaces: *overridden

tests/vyos/modules/interfaces/populate.yaml

@@ -10,7 +10,5 @@
       set interfaces ethernet "{{ intf }}" mtu '1200'
   loop:
     - eth1
-    - eth2
-    - eth3
   loop_control:
     loop_var: intf

tests/vyos/modules/interfaces/remove_config.yaml

@@ -11,7 +11,5 @@
       delete interfaces ethernet "{{ intf }}" disable
   loop:
     - eth1
-    - eth2
-    - eth3
   loop_control:
     loop_var: intf

tests/vyos/modules/interfaces/replaced.yaml

@@ -9,10 +9,6 @@
     config:
       - name: eth1
         description: "Replaced by Ansible"
-
-      - name: eth2
-        mtu: 1500
-        description: "Replaced by Ansible"
     state: replaced
   register: result
 
@@ -22,10 +18,6 @@
       - "'delete interfaces ethernet eth1 speed' in result.commands"
       - "'delete interfaces ethernet eth1 duplex' in result.commands"
       - "'set interfaces ethernet eth1 description \\'Replaced by Ansible\\'' in result.commands"
-      - "'set interfaces ethernet eth2 mtu \\'1500\\'' in result.commands"
-      - "'delete interfaces ethernet eth2 speed' in result.commands"
-      - "'delete interfaces ethernet eth2 duplex' in result.commands"
-      - "'set interfaces ethernet eth2 description \\'Replaced by Ansible\\'' in result.commands"
 
 - name: Replace device configurations of listed interfaces with provided configurarions
   vyos_interfaces: *replaced

tox.ini

@@ -6,7 +6,8 @@ envlist = linters
 [testenv]
 basepython = python3
 install_command = pip install {opts} {packages}
-deps = -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 
 [testenv:linters]
 basepython = python3
@@ -15,6 +16,9 @@ commands =
   flake8 {posargs}
 
 [testenv:venv]
+setenv =
+  ANSIBLE_CONFIG = {toxinidir}/tests/ansible.cfg
+  ANSIBLE_CALLBACK_PLUGINS = {envsitepackagesdir}/ara/plugins/callbacks
 basepython = python3
 commands = {posargs}