Merge pull request Juniper#206 from eeishaan/ignore-null-id-bug

 Fix Juniper#184 -- ignore-null functionality with `id` field in check operators

Author: vnitinv

lib/jnpr/jsnapy/check.py

@@ -253,10 +253,19 @@ def expression_builder(self, sub_expr, parent_op=None, **kwargs):
                 #this should be guaranteed by the operator function, never use try-catch here
                 last_test_instance = kwargs['op'].test_details[kwargs['teston']][-1]
                 res = last_test_instance['result']
-                
+
+                values = ['err', 'info']
+                testvalues = elem.keys()
+                testop1 = [
+                    tvalue for tvalue in testvalues if tvalue not in values]
+                testop = testop1[0] if testop1 else "Define test operator"
                 #for skipping cases
-                if res is None or ( last_test_instance['count']['pass'] == 0 \
-                                   and last_test_instance['count']['fail'] == 0 ): 
+                if res is None or (last_test_instance['count']['pass'] == 0 and
+                                   last_test_instance['count']['fail'] == 0 and
+                                   testop not in ['no-diff',
+                                                  'list-not-less',
+                                                  'list-not-more'
+                                                  ]):
                     continue
 
                 ret_expr.append(str(res))

lib/jnpr/jsnapy/operator.py

@@ -14,4 +14,4 @@ test_command_version:
         - no-diff: oper-status       # element in which test is performed
           err: "Test Failed!! oper-status  got changed, before it was <{{pre['oper-status']}}>, now it is <{{post['oper-status']}}> with name <{{id_0}}> and admin status <{{post['admin-status']}}>"
           info: "Test succeeded!! oper-status is same with value, before it is <{{pre['oper-status']}}> now it is <{{post['oper-status']}}> with admin status <{{post['admin-status']}}> "
-
+          

samples/test_no_diff.yml

@@ -0,0 +1,10 @@
+check_chassis_fpc:
+  - command: show chassis fpc
+  - item: 
+      xpath: //fpc
+      id: bogus-slot
+      tests:
+        - delta: memory-heap-utilization, 50%
+          info: "Test Succeeded!! Memory heap utilisation of the FPC {{id_0}} has changed less than 50%"
+          err: "Test Failed!!! Memory heap utilisation of the FPC {{id_0}} has changed less than 50%"
+          ignore-null: True

tests/unit/configs/delta_ignore-null_id_skip.yml

@@ -0,0 +1,17 @@
+
+
+# use '/' in your test cases apart from xpath if u want to search all elements irrespective of hierarchy, ex: in id if u use /name instead of name
+# then it will search in all the names in given xpath irrespective of their position
+# for simple, one test using command
+
+test_command_version1:
+  - command: show interfaces terse ge-*
+  - iterate:
+      xpath: physical-interface
+      id: bogus-name
+      tests:
+        - list-not-less: name
+          err: "Interface {{pre['name']}} is missing in post snapshot"
+          info: "Interface {{pre['name']}} is present in post snapshot"
+          ignore-null: True
+          

tests/unit/configs/list-not-less_ignore-null_id_skip.yml

@@ -0,0 +1,18 @@
+tests_include:
+  - test_command_version
+
+# use '/' in your test cases apart from xpath if u want to search all elements irrespective of hierarchy, ex: in id if u use /name instead of name
+# then it will search in all the names in given xpath irrespective of their position
+# for simple, one test using command
+
+test_command_version:
+  - command: show interfaces terse ge-*
+  - iterate:
+      xpath: physical-interface
+      id: bogus-name
+      tests:
+        - list-not-more: name
+          err: "Interface {{post['name']}} has been added in post snapshot"
+          info: "Interface {{post['name']}} was present in pre snapshot"
+          ignore-null: True
+

tests/unit/configs/list-not-more_ignore-null_id_skip.yml

@@ -0,0 +1,14 @@
+
+# for one device, can be given like this:
+hosts:
+  - device: 10.216.193.114
+    username : abc
+    passwd: xyz
+tests:
+  - delta_ignore-null_id_skip.yml
+
+sqlite:
+  - store_in_sqlite: yes
+    check_from_sqlite: no
+    database_name: jbb.db
+

tests/unit/configs/main_delta_ignore-null_id_skip.yml

@@ -0,0 +1,11 @@
+
+# for one device, can be given like this:
+hosts:
+  - device: 10.216.193.114
+    username : abc
+    passwd: xyz
+tests:
+  - list-not-less_ignore-null_id_skip.yml
+
+
+

tests/unit/configs/main_list-not-less_ignore-null_id_skip.yml

@@ -0,0 +1,15 @@
+
+# for one device, can be given like this:
+hosts:
+  - device: 10.216.193.114
+    username : abc
+    passwd: xyz
+tests:
+  - list-not-more_ignore-null_id_skip.yml
+
+sqlite:
+  - store_in_sqlite: yes
+    check_from_sqlite: no
+    database_name: jbb.db
+
+

tests/unit/configs/main_list-not-more_ignore-null_id_skip.yml

@@ -0,0 +1,14 @@
+
+# for one device, can be given like this:
+hosts:
+  - device: 10.216.193.114
+    username : abc
+    passwd: xyz
+tests:
+  - no-diff_ignore-null_id_skip.yml
+
+# sqlite:
+#   - store_in_sqlite: yes
+#     check_from_sqlite: no
+#     database_name: jbb.db
+