ServiceNowITOM · willtome · Feb 29, 2020 · Feb 29, 2020 · Mar 2, 2020 · Mar 3, 2020
diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
@@ -20,13 +20,10 @@ jobs:
           # Testing against `devel` may fail as new tests are added.
           - stable-2.9 # Only if your collection supports Ansible 2.9
           - stable-2.10
+          - stable-2.11
           - devel
         python:
-          - 2.7
-          - 3.7
           - 3.8
-        exclude:
-          - python: 3.8  # blocked by ansible/ansible#70155
     runs-on: ubuntu-latest
     steps:
 

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,17 +5,27 @@ Servicenow.Servicenow Release Notes
 .. contents:: Topics
 
 
+v1.0.7
+======
+
+Release Summary
+---------------
+
+DEPRECATED - This collection is deprecated in favor of servicenow.itsm.
+
+Minor Changes
+-------------
+
+- add environment var SN_FILTER_RESULTS to inventory plugin
 
 v1.0.6
 ======
 
 Bugfixes
 --------
 
-- Resolves Issues #58, #57, #51 and makes auth backwards compatible by defaulting to OAuth if client_id is present without specifying auth. 
-- Order_by is implemented client-side to provide proper sorting as previously documented.
-
-=======
+- makes auth backwards compatible by defaulting to OAuth if client_id is present without specifying auth
+- order_by again working by locally sorting return list of records
 
 v1.0.5
 ======

diff --git a/README.md b/README.md
@@ -1,5 +1,10 @@
 ![CI](https://github.com/ServiceNowITOM/servicenow-ansible/workflows/CI/badge.svg)
 
+## **[DEPRECATED]**
+This collection is superseded by [servicenow.itsm](https://galaxy.ansible.com/servicenow/itsm). Please open any new issues, pull requests, and feature requests to the new [repository](https://github.com/ansible-collections/servicenow.itsm). Thank you to all that contributed and helped to make this collection a success.
+
+--- 
+
 # Ansible Collection for ServiceNow
 This collection provides a series of Ansible modules, roles, and plugins for interacting with [ServiceNow](https://servicenow.com)
 

diff --git a/changelogs/.plugin-cache.yaml b/changelogs/.plugin-cache.yaml
@@ -22,7 +22,8 @@ plugins:
       name: snow_record_find
       namespace: ''
       version_added: null
+  netconf: {}
   shell: {}
   strategy: {}
   vars: {}
-version: 1.0.6
+version: 1.0.7
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -43,8 +43,19 @@ releases:
   1.0.6:
     changes:
       bugfixes:
+      - makes auth backwards compatible by defaulting to OAuth if client_id is present
+        without specifying auth
       - order_by again working by locally sorting return list of records
-      - makes auth backwards compatible by defaulting to OAuth if client_id is present without specifying auth
     fragments:
     - 58_order_by.yml
     release_date: '2021-05-26'
+  1.0.7:
+    changes:
+      deprecated_features: This collection is deprecated in favor of servicenow.itsm
+      minor_changes:
+      - add environment var SN_FILTER_RESULTS to inventory plugin
+      release_summary: DEPRECATED - This collection is deprecated in favor of servicenow.itsm.
+    fragments:
+    - 64_filter_env_vars.yml
+    - 69_deprecation.yml
+    release_date: '2021-09-13'
diff --git a/config/now.yml.sample b/config/now.yml.sample
@@ -1,5 +1,5 @@
 plugin: servicenow.servicenow.now
-instance: demo.service-now.com
-username: admin
-password: password
+instance: 
+username: 
+password: 
 cache: True
diff --git a/docs/inventory.md b/docs/inventory.md
@@ -166,5 +166,19 @@ compose:
 keyed_groups:
   - key: sn_tags | lower
     prefix: 'tag'
+```
 
+### Use related table field
+```yaml
+plugin: servicenow.servicenow.now
+instance: dev89007
+username: admin
+password: password
+table: cmdb_ci_netgear
+selection_order: fqdn
+fields: [name,host_name,fqdn,model_id.model_number]
+filter_results: operational_status=1^fqdnISNOTEMPTY^manufacturerSTARTSWITHCisco
+keyed_groups:
+  - key: sn_model_id_model_number | lower
+    prefix: 'model'
 ```
diff --git a/galaxy.yml.j2 b/galaxy.yml.j2
@@ -9,6 +9,7 @@ authors:
 - "Will Tome (@willtome)"
 - "Alex Mittell (@alex_mittell)"
 description: >
+    [DEPRECTATED] Please migrate to servicenow.itsm. 
     The Service Now modules previously packaged as part of Ansible, now
     in a Collection distributed via Ansible Galaxy.  snow_record creates,
     updates or deletes a record in a specified table in the Service Now

diff --git a/meta/runtime.yml b/meta/runtime.yml
@@ -1,2 +1,17 @@
 ---
-requires_ansible: '>=2.9.10'
+requires_ansible: '>=2.9.10'
+plugin_routing:
+  inventory:
+    now:
+      tombstone:
+        removal_version: "6.0.0"
+        warning_text: Please migrate to inventory provided by servicenow.itsm collection
+  modules:
+    snow_record:
+      deprecation:
+        removal_version: "6.0.0"
+        warning_text: Please migrate to modules provided by servicenow.itsm collection
+    snow_record_find:
+      deprecation:
+        removal_version: "6.0.0"
+        warning_text: Please migrate to modules provided by servicenow.itsm collection
diff --git a/plugins/doc_fragments/service_now.py b/plugins/doc_fragments/service_now.py
@@ -106,4 +106,7 @@ class ModuleDocFragment(object):
       - Any other credentials previously supplied, must be provided again.
       required: false
       type: dict
+deprecated:
+  removed_in: "6.0.0"
+  why: This collection is deprecated in favor of servicenow.itsm
 '''
diff --git a/plugins/inventory/now.py b/plugins/inventory/now.py
@@ -66,7 +66,10 @@
             type: string
             default: cmdb_ci_server
         fields:
-            description: Comma seperated string providing additional table columns to add as host vars to each inventory host.
+            description:
+            - Comma seperated string providing additional table columns to add as host vars to each inventory host.
+            - Related table fields are valid.  Usual period separator is changed to underscore.
+            - e.g. sn_model_id.model_name -> sn_model_id_model_name
             type: list
             default: 'ip_address,fqdn,host_name,sys_class_name,name'
         selection_order:
@@ -77,6 +80,8 @@
             description: Filter results with sysparm_query encoded query string syntax. Complete list of operators available for filters and queries.
             type: string
             default: ''
+            env:
+              - name: SN_FILTER_RESULTS
         proxy:
             description: Proxy server to use for requests to ServiceNow.
             type: string
@@ -137,6 +142,19 @@
 keyed_groups:
   - key: sn_tags | lower
     prefix: 'tag'
+
+# Use related table field
+plugin: servicenow.servicenow.now
+instance: dev89007
+username: admin
+password: password
+table: cmdb_ci_netgear
+selection_order: fqdn
+fields: [name,host_name,fqdn,model_id.model_number]
+filter_results: operational_status=1^fqdnISNOTEMPTY^manufacturerSTARTSWITHCisco
+keyed_groups:
+  - key: sn_model_id_model_number | lower
+    prefix: 'model'
 '''
 
 try:
@@ -286,7 +304,8 @@ def parse(self, inventory, loader, path,
 
             # set variables for host
             for k in record.keys():
-                self.inventory.set_variable(host_name, 'sn_%s' % k, record[k])
+                k2 = k.replace('.', '_')
+                self.inventory.set_variable(host_name, 'sn_%s' % k2, record[k])
 
             # add relationship based groups
             if enhanced and enhanced_groups:

diff --git a/tests/enhanced.now.yml b/tests/enhanced.now.yml
@@ -1,8 +1,8 @@
 ---
 plugin: servicenow.servicenow.now
-instance: dev93775.service-now.com
-username: admin
-password: knTVFcRlD6d9
+instance: 
+username: 
+password: 
 selection_order: name
 enhanced: True
 #keyed_groups:

diff --git a/tests/module_test.yml b/tests/module_test.yml
@@ -2,10 +2,10 @@
 - hosts: localhost
   gather_facts: no
   vars:
-    sn_instance: dev89007
+    sn_instance: 
     login: &login
-      username: admin
-      password: ha53wiaYCKDX
+      username: 
+      password: 
 
   tasks:
   - name: test with instance
@@ -33,4 +33,4 @@
       query:
         starts_with:
           - short_description: "Test"
-      <<: *login
+      <<: *login
diff --git a/tests/module_test_cmdb_ci_server.yml b/tests/module_test_cmdb_ci_server.yml
@@ -2,10 +2,10 @@
 - hosts: localhost
   gather_facts: no
   vars:
-    sn_instance: dev89007
+    sn_instance: 
     login: &login
-      username: admin
-      password: ha53wiaYCKDX
+      username: 
+      password: 
 
   tasks:
     - set_fact:

diff --git a/tests/network.enhanced.now.yml b/tests/network.enhanced.now.yml
@@ -1,8 +1,8 @@
 ---
 plugin: servicenow.servicenow.now
-instance: dev93775.service-now.com
-username: admin
-password: le4MnTLd3bCK
+instance: 
+username: 
+password: 
 table: cmdb_ci_netgear
 selection_order: name
 enhanced: True
diff --git a/tests/now.yml b/tests/now.yml
@@ -1,8 +1,8 @@
 ---
 plugin: servicenow.servicenow.now
-host: dev95176.service-now.com
-username: admin
-password: P0aX7VAtnyXm
+host: 
+username: 
+password: 
 selection_order: name
 fields:
   - os
@@ -23,4 +23,4 @@ keyed_groups:
       prefix: ''
       separator: ''
 compose:
-  os_class: sn_os.split(' ')[0]
+  os_class: sn_os.split(' ')[0]