junos Use inventory_hostname_short (ansible#20061)

Don't use hardcoded hostnames
mfuchs · Jan 9, 2017 · b8ee80a · b8ee80a
1 parent 8a8090e
commit b8ee80a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/test/integration/targets/junos_command/tests/netconf_text/contains.yaml b/test/integration/targets/junos_command/tests/netconf_text/contains.yaml
@@ -8,7 +8,7 @@
       - show interfaces fxp0
     display: text
     wait_for:
-      - "result[0] contains vsrx01"
+      - "result[0] contains {{ inventory_hostname_short }}"
       - "result[1] contains fxp0"
     provider: "{{ netconf }}"
   register: result

diff --git a/test/integration/targets/junos_command/tests/netconf_xml/contains.yaml b/test/integration/targets/junos_command/tests/netconf_xml/contains.yaml
@@ -8,7 +8,7 @@
       - show interfaces fxp0
     format: xml
     wait_for:
-      - "result[0].software-information.host-name contains vsrx01"
+      - "result[0].software-information.host-name contains {{ inventory_hostname_short }}"
       - "result[1].interface-information.physical-interface.name contains fxp0"
     provider: "{{ netconf }}"
   register: result

diff --git a/test/integration/targets/junos_command/tests/netconf_xml/equal.yaml b/test/integration/targets/junos_command/tests/netconf_xml/equal.yaml
@@ -7,7 +7,7 @@
       - show version
       - show interfaces fxp0
     wait_for:
-      - "result[0].software-information.host-name == vsrx01"
+      - "result[0].software-information.host-name == {{ inventory_hostname_short }}"
       - "result[1].interface-information.physical-interface.name == fxp0"
     format: xml
     provider: "{{ netconf }}"
@@ -25,7 +25,7 @@
       - show version
       - show interfaces fxp0
     wait_for:
-      - "result[0].software-information.host-name eq vsrx01"
+      - "result[0].software-information.host-name eq {{ inventory_hostname_short }}"
       - "result[1].interface-information.physical-interface.name eq fxp0"
     format: xml
     provider: "{{ netconf }}"