From 70db07fa82d3e3bb1e8acf4c225e786a37adbf28 Mon Sep 17 00:00:00 2001 From: Ganesh Nalawade Date: Fri, 12 Jul 2019 23:25:29 +0530 Subject: [PATCH] Fix junos_interfaces integration test failure (#59035) * Fix junos_interfaces failure * Remove lo0 interface by default since vsrz zuul env seems to add it intermittently as part of device intial config * Add missing change for replace case --- .../targets/junos_interfaces/tests/netconf/_remove_config.yaml | 3 ++- .../targets/junos_interfaces/tests/netconf/deleted.yaml | 2 -- .../targets/junos_interfaces/tests/netconf/merged.yaml | 2 -- .../targets/junos_interfaces/tests/netconf/overridden.yaml | 2 -- .../targets/junos_interfaces/tests/netconf/replaced.yaml | 2 -- .../targets/junos_interfaces/tests/netconf/rtt.yaml | 2 -- 6 files changed, 2 insertions(+), 11 deletions(-) diff --git a/test/integration/targets/junos_interfaces/tests/netconf/_remove_config.yaml b/test/integration/targets/junos_interfaces/tests/netconf/_remove_config.yaml index e7163450ee..24e673c05e 100644 --- a/test/integration/targets/junos_interfaces/tests/netconf/_remove_config.yaml +++ b/test/integration/targets/junos_interfaces/tests/netconf/_remove_config.yaml @@ -2,12 +2,13 @@ - debug: msg: "Start junos_nterfaces deleted remove interface config ansible_connection={{ ansible_connection }}" -- name: Remove interface config +- name: "Setup - remove interface config" junos_config: lines: - delete interfaces ge-0/0/1 - delete interfaces ge-0/0/2 - delete interfaces ge-0/0/3 + - delete interfaces lo0 - debug: msg: "End junos_nterfaces deleted remove interface config ansible_connection={{ ansible_connection }}" diff --git a/test/integration/targets/junos_interfaces/tests/netconf/deleted.yaml b/test/integration/targets/junos_interfaces/tests/netconf/deleted.yaml index e242813f89..e9a2031040 100644 --- a/test/integration/targets/junos_interfaces/tests/netconf/deleted.yaml +++ b/test/integration/targets/junos_interfaces/tests/netconf/deleted.yaml @@ -8,8 +8,6 @@ expected_deleted_output: - name: fxp0 enable: true - - name: lo0 - enable: true - block: - name: Configure initial state for interface diff --git a/test/integration/targets/junos_interfaces/tests/netconf/merged.yaml b/test/integration/targets/junos_interfaces/tests/netconf/merged.yaml index 234de59cee..bf97271689 100644 --- a/test/integration/targets/junos_interfaces/tests/netconf/merged.yaml +++ b/test/integration/targets/junos_interfaces/tests/netconf/merged.yaml @@ -25,8 +25,6 @@ down: 3200 - name: fxp0 enable: true - - name: lo0 - enable: true - block: - name: Merge the provided configuration with the exisiting running configuration diff --git a/test/integration/targets/junos_interfaces/tests/netconf/overridden.yaml b/test/integration/targets/junos_interfaces/tests/netconf/overridden.yaml index d82874911a..89a87247de 100644 --- a/test/integration/targets/junos_interfaces/tests/netconf/overridden.yaml +++ b/test/integration/targets/junos_interfaces/tests/netconf/overridden.yaml @@ -11,8 +11,6 @@ enable: true - name: fxp0 enable: true - - name: lo0 - enable: true - block: - name: Configure initial state for interface diff --git a/test/integration/targets/junos_interfaces/tests/netconf/replaced.yaml b/test/integration/targets/junos_interfaces/tests/netconf/replaced.yaml index 7db3992203..7116123f17 100644 --- a/test/integration/targets/junos_interfaces/tests/netconf/replaced.yaml +++ b/test/integration/targets/junos_interfaces/tests/netconf/replaced.yaml @@ -21,8 +21,6 @@ down: 3200 - name: fxp0 enable: true - - name: lo0 - enable: true - block: - name: Configure initial state for interface diff --git a/test/integration/targets/junos_interfaces/tests/netconf/rtt.yaml b/test/integration/targets/junos_interfaces/tests/netconf/rtt.yaml index e2f588771d..1ca36033dc 100644 --- a/test/integration/targets/junos_interfaces/tests/netconf/rtt.yaml +++ b/test/integration/targets/junos_interfaces/tests/netconf/rtt.yaml @@ -25,8 +25,6 @@ down: 3200 - name: fxp0 enable: true - - name: lo0 - enable: true - block: - name: Apply the provided configuration (base config)