From 81d81d7997b48d97798f8efaddb49e6d0a99babe Mon Sep 17 00:00:00 2001
From: sai chintalapudi <saichint@cisco.com>
Date: Wed, 9 May 2018 17:00:31 -0400
Subject: [PATCH 1/2] IT cases for nxos_logging

---
 .../nxos_logging/tests/common/basic.yaml      | 94 ++++++++++++-------
 1 file changed, 62 insertions(+), 32 deletions(-)

diff --git a/test/integration/targets/nxos_logging/tests/common/basic.yaml b/test/integration/targets/nxos_logging/tests/common/basic.yaml
index 5e4d99eb5242f1..850c196c09eb3a 100644
--- a/test/integration/targets/nxos_logging/tests/common/basic.yaml
+++ b/test/integration/targets/nxos_logging/tests/common/basic.yaml
@@ -4,7 +4,7 @@
   when: ansible_connection == "local"
 
 - name: Set up console logging
-  nxos_logging:
+  nxos_logging: &clog
     dest: console
     dest_level: 0
     state: present
@@ -17,73 +17,95 @@
       - '"logging console 0" in result.commands'
 
 - name: Set up console logging again (idempotent)
-  nxos_logging:
-    dest: console
-    dest_level: 0
-    state: present
-    provider: "{{ connection }}"
+  nxos_logging: *clog
   register: result
 
-- assert:
+- assert: &false
     that:
       - 'result.changed == false'
 
-- name: Delete/disable console logging
-  nxos_logging:
-    dest: console
-    dest_level: 0
-    state: absent
+- name: Logfile logging with level
+  nxos_logging: &llog
+    dest: logfile
+    name: test
+    dest_level: 1
+    state: present
     provider: "{{ connection }}"
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
-      - '"no logging console" in result.commands'
+      - '"logging logfile test 1" in result.commands'
 
-- name: Delete/disable console logging (idempotent)
-  nxos_logging:
-    dest: console
-    dest_level: 0
-    state: absent
+- name: Logfile logging with level (idempotent)
+  nxos_logging: *llog
+  register: result
+
+- assert: *false
+
+- name: Configure module with level
+  nxos_logging: &molog
+    dest: module
+    dest_level: 2
     provider: "{{ connection }}"
   register: result
 
 - assert:
     that:
-      - 'result.changed == false'
+      - 'result.changed == true'
+      - '"logging module 2" in result.commands'
 
-- name: Logfile logging with level
-  nxos_logging:
-    dest: logfile
-    name: test
-    dest_level: 0
-    state: present
+- name: Configure module with level (idempotent)
+  nxos_logging: *molog
+  register: result
+
+- assert: *false
+
+- name: Configure monitor with level
+  nxos_logging: &mlog
+    dest: monitor
+    dest_level: 3
     provider: "{{ connection }}"
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
-      - '"logging logfile test 0" in result.commands'
+      - '"logging monitor 3" in result.commands'
+
+- name: Configure monitor with level (idempotent)
+  nxos_logging: *mlog
+  register: result
+
+- assert: *false
 
 - name: Configure facility with level
-  nxos_logging:
+  nxos_logging: &flog
     facility: daemon
-    facility_level: 0
+    facility_level: 4
     provider: "{{ connection }}"
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
-      - '"logging level daemon 0" in result.commands'
+      - '"logging level daemon 4" in result.commands'
+
+- name: Configure facility with level (idempotent)
+  nxos_logging: *flog
+  register: result
+
+- assert: *false
 
 - name: remove logging as collection tearDown
-  nxos_logging:
+  nxos_logging: &agg
     aggregate:
-      - { dest: logfile, name: test, dest_level: 0, state: absent }
-      - { facility: daemon, facility_level: 0, state: absent }
+      - { dest: console, dest_level: 0, state: absent }
+      - { dest: module, dest_level: 2, state: absent }
+      - { dest: monitor, dest_level: 3, state: absent }
+      - { dest: logfile, dest_level: 1, name: test, state: absent }
+      - { facility: daemon, facility_level: 4, state: absent }
     provider: "{{ connection }}"
   register: result
 
@@ -92,5 +114,13 @@
       - 'result.changed == true'
       - '"no logging logfile" in result.commands'
       - '"no logging level daemon" in result.commands'
+      - '"no logging monitor" in result.commands'
+      - '"no logging module" in result.commands'
+
+- name: remove aggregate logging (idempotent)
+  nxos_logging: *agg
+  register: result
+
+- assert: *false
 
 - debug: msg="END connection={{ ansible_connection }} nxos_logging basic test"

From bea28d534252c77c58abed9cf0533029e3c64fdb Mon Sep 17 00:00:00 2001
From: sai chintalapudi <saichint@cisco.com>
Date: Thu, 10 May 2018 12:48:09 -0400
Subject: [PATCH 2/2] review comment

---
 .../targets/nxos_logging/tests/common/basic.yaml      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/integration/targets/nxos_logging/tests/common/basic.yaml b/test/integration/targets/nxos_logging/tests/common/basic.yaml
index 850c196c09eb3a..f9bbb2c4106492 100644
--- a/test/integration/targets/nxos_logging/tests/common/basic.yaml
+++ b/test/integration/targets/nxos_logging/tests/common/basic.yaml
@@ -101,11 +101,12 @@
 - name: remove logging as collection tearDown
   nxos_logging: &agg
     aggregate:
-      - { dest: console, dest_level: 0, state: absent }
-      - { dest: module, dest_level: 2, state: absent }
-      - { dest: monitor, dest_level: 3, state: absent }
-      - { dest: logfile, dest_level: 1, name: test, state: absent }
-      - { facility: daemon, facility_level: 4, state: absent }
+      - { dest: console, dest_level: 0 }
+      - { dest: module, dest_level: 2 }
+      - { dest: monitor, dest_level: 3 }
+      - { dest: logfile, dest_level: 1, name: test }
+      - { facility: daemon, facility_level: 4 }
+    state: absent
     provider: "{{ connection }}"
   register: result