From 7d982f9225b70708b084a73b63e9bd57b08d0286 Mon Sep 17 00:00:00 2001
From: Trishna Guha <trishnaguha17@gmail.com>
Date: Tue, 12 Sep 2017 10:54:15 +0530
Subject: [PATCH] nxos_command and nxos_config fix (#29940)

* fix nxos_command nxapi test output

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit 9dee5c65ce88912b1bd28e75d85dd7331420f823)

* nxos_config CI fix

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit 8810a7e58457b35fe269101075986d57030342f4)
---
 .../integration/targets/nxos_command/tests/nxapi/sanity.yaml | 5 +++--
 .../targets/nxos_config/tests/cli/toplevel_after.yaml        | 4 ++--
 .../targets/nxos_config/tests/cli/toplevel_before.yaml       | 4 ++--
 .../targets/nxos_config/tests/nxapi/toplevel_after.yaml      | 4 ++--
 .../targets/nxos_config/tests/nxapi/toplevel_before.yaml     | 4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/test/integration/targets/nxos_command/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_command/tests/nxapi/sanity.yaml
index 47e3cce0f8..b457624c96 100644
--- a/test/integration/targets/nxos_command/tests/nxapi/sanity.yaml
+++ b/test/integration/targets/nxos_command/tests/nxapi/sanity.yaml
@@ -41,8 +41,9 @@
 
   - name: "Run show running-config bgp - should pass"
     nxos_command:
-      commands:
-        - sh running-config bgp
+      commands: 
+        - command: sh running-config bgp
+          output: text
       provider: "{{ nxapi }}"
     register: result
 
diff --git a/test/integration/targets/nxos_config/tests/cli/toplevel_after.yaml b/test/integration/targets/nxos_config/tests/cli/toplevel_after.yaml
index 393b686fc0..cc62c01930 100644
--- a/test/integration/targets/nxos_config/tests/cli/toplevel_after.yaml
+++ b/test/integration/targets/nxos_config/tests/cli/toplevel_after.yaml
@@ -5,7 +5,7 @@
   nxos_config:
     lines:
       - "snmp-server contact ansible"
-      - "hostname {{ inventory_hostname_short }}"
+      - "hostname switch"
     provider: "{{ cli }}"
     match: none
 
@@ -37,7 +37,7 @@
   nxos_config:
     lines:
       - "no snmp-server contact"
-      - "hostname {{ inventory_hostname_short }}"
+      - "hostname switch"
     provider: "{{ cli }}"
     match: none
 
diff --git a/test/integration/targets/nxos_config/tests/cli/toplevel_before.yaml b/test/integration/targets/nxos_config/tests/cli/toplevel_before.yaml
index acec416683..75d88690a0 100644
--- a/test/integration/targets/nxos_config/tests/cli/toplevel_before.yaml
+++ b/test/integration/targets/nxos_config/tests/cli/toplevel_before.yaml
@@ -5,7 +5,7 @@
   nxos_config:
     lines:
       - "snmp-server contact ansible"
-      - "hostname {{ inventory_hostname_short }}"
+      - "hostname switch"
     provider: "{{ cli }}"
     match: none
 
@@ -37,7 +37,7 @@
   nxos_config:
     lines:
       - "no snmp-server contact"
-      - "hostname {{ inventory_hostname_short }}"
+      - "hostname switch"
     provider: "{{ cli }}"
     match: none
 
diff --git a/test/integration/targets/nxos_config/tests/nxapi/toplevel_after.yaml b/test/integration/targets/nxos_config/tests/nxapi/toplevel_after.yaml
index 6eeeeafd2c..0c534c5c0d 100644
--- a/test/integration/targets/nxos_config/tests/nxapi/toplevel_after.yaml
+++ b/test/integration/targets/nxos_config/tests/nxapi/toplevel_after.yaml
@@ -5,7 +5,7 @@
   nxos_config:
     lines:
       - "snmp-server contact ansible"
-      - "hostname {{ inventory_hostname_short }}"
+      - "hostname switch"
     provider: "{{ nxapi }}"
     match: none
 
@@ -37,7 +37,7 @@
   nxos_config:
     lines:
       - "no snmp-server contact ansible"
-      - "hostname {{ inventory_hostname_short }}"
+      - "hostname switch"
     provider: "{{ nxapi }}"
     match: none
 
diff --git a/test/integration/targets/nxos_config/tests/nxapi/toplevel_before.yaml b/test/integration/targets/nxos_config/tests/nxapi/toplevel_before.yaml
index 17e3390d70..a5f0830499 100644
--- a/test/integration/targets/nxos_config/tests/nxapi/toplevel_before.yaml
+++ b/test/integration/targets/nxos_config/tests/nxapi/toplevel_before.yaml
@@ -5,7 +5,7 @@
   nxos_config:
     lines:
       - "snmp-server contact ansible"
-      - "hostname {{ inventory_hostname_short }}"
+      - "hostname switch"
     provider: "{{ nxapi }}"
     match: none
 
@@ -37,7 +37,7 @@
   nxos_config:
     lines:
       - "no snmp-server contact ansible"
-      - "hostname {{ inventory_hostname_short }}"
+      - "hostname switch"
     provider: "{{ nxapi }}"
     match: none