Allow regular expressions from ignore list (-r)

.github/workflows/python2check.yml

@@ -1,77 +0,0 @@
-# @file python2check.yml
----
-name: Python2 check
-
-# Trigger the workflow on push or pull request
-on: [push, pull_request]
-
-jobs:
-  python2-pywbem08:
-    runs-on: ubuntu-18.04
-    steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-python@v1
-      with:
-        python-version: '2.7'
-    - name: Install pywbem from apt
-      run: |
-        sudo apt-get install -qq -yy python-pywbem
-    - name: Set environment PYTHONPATH
-      run: |
-        export PYTHONPATH=/opt/hostedtoolcache/Python
-    - name: Launch script with --help
-      run: |
-        ./check_esxi_hardware.py --help
-
-# Jobs with PIP installations are currently disabled. 
-#  python2-pywbem09:
-#    runs-on: ubuntu-latest
-#    steps:
-#    - uses: actions/checkout@v1
-#    - uses: actions/setup-python@v1
-#      with:
-#        python-version: '2.7'
-#    - name: Install latest pywbem from pip
-#      run: |
-#        sudo apt-get install -qq -yy python-pip
-#        pip install pywbem==0.9.1
-#    - name: Set environment PYTHONPATH
-#      run: |
-#        export PYTHONPATH=/opt/hostedtoolcache/Python
-#    - name: Launch script with --help
-#      run: |
-#        ./check_esxi_hardware.py --help
-#  python2-pywbem012:
-#    runs-on: ubuntu-latest
-#    steps:
-#    - uses: actions/checkout@v1
-#    - uses: actions/setup-python@v1
-#      with:
-#        python-version: '2.7'
-#    - name: Install latest pywbem from pip
-#      run: |
-#        sudo apt-get install -qq -yy python-pip
-#        pip install pywbem==0.12.6
-#    - name: Set environment PYTHONPATH
-#      run: |
-#        export PYTHONPATH=/opt/hostedtoolcache/Python
-#    - name: Launch script with --help
-#      run: |
-#        ./check_esxi_hardware.py --help
-#  python2-pywbem014:
-#    runs-on: ubuntu-latest
-#    steps:
-#    - uses: actions/checkout@v1
-#    - uses: actions/setup-python@v1
-#      with:
-#        python-version: '2.7'
-#    - name: Install latest pywbem from pip
-#      run: |
-#        sudo apt-get install -qq -yy python-pip
-#        pip install pywbem==0.14.6
-#    - name: Set environment PYTHONPATH
-#      run: |
-#        export PYTHONPATH=/opt/hostedtoolcache/Python
-#    - name: Launch script with --help
-#      run: |
-#        ./check_esxi_hardware.py --help

.github/workflows/python3check.yml

@@ -1,114 +0,0 @@
-# @file python3check.yml
----
-name: Python3 check
-
-# Trigger the workflow on push or pull request
-on: [push, pull_request]
-
-jobs:
-  simple-output:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Simple hello world
-        run: echo "Hello World"
-#  python3-pywbem-latest:
-#    runs-on: ubuntu-latest
-#    steps:
-#    - uses: actions/checkout@v1
-#    - uses: actions/setup-python@v1
-#      with:
-#        python-version: '3.8'
-#    - name: Install latest pywbem from pip
-#      run: |
-#        sudo apt-get install -qq -yy python3-pip
-#        pip3 install pywbem
-#    - name: Set environment PYTHONPATH
-#      run: |
-#        export PYTHONPATH=/opt/hostedtoolcache/Python/3.8.0/x64/lib/python3.8/site-packages
-#    - name: Verify python sys.path
-#      run: (echo "import sys"; echo "print(', '.join(sys.path))") | python
-#    - name: Launch script with --help
-#      run: |
-#        ./check_esxi_hardware.py --help
-#  python3-pywbem-08:
-#    runs-on: ubuntu-latest
-#    steps:
-#    - uses: actions/checkout@v1
-#    - uses: actions/setup-python@v1
-#      with:
-#        python-version: '3.x'
-#    - name: Install latest pywbem from pip
-#      run: |
-#        sudo apt-get install -qq -yy python3-pip
-#        pip3 install pywbem==0.8.4
-#    - name: Set environment PYTHONPATH
-#      run: |
-#        export PYTHONPATH=/opt/hostedtoolcache/Python
-#    - name: Launch script with --help
-#      run: |
-#        ./check_esxi_hardware.py --help
-#  python3-pywbem-012:
-#    runs-on: ubuntu-latest
-#    steps:
-#    - uses: actions/checkout@v1
-#    - uses: actions/setup-python@v1
-#      with:
-#        python-version: '3.x'
-#    - name: Install latest pywbem from pip
-#      run: |
-#        sudo apt-get install -qq -yy python3-pip
-#        pip3 install pywbem==0.12.6
-#    - name: Set environment PYTHONPATH
-#      run: |
-#        export PYTHONPATH=/opt/hostedtoolcache/Python
-#    - name: Launch script with --help
-#      run: |
-#        ./check_esxi_hardware.py --help
-#  python3-pywbem-013:
-#    runs-on: ubuntu-latest
-#    steps:
-#    - uses: actions/checkout@v1
-#    - uses: actions/setup-python@v1
-#      with:
-#        python-version: '3.x'
-#    - name: Install latest pywbem from pip
-#      run: |
-#        sudo apt-get install -qq -yy python3-pip
-#        pip3 install pywbem==0.13.1
-#    - name: Set environment PYTHONPATH
-#      run: |
-#        export PYTHONPATH=/opt/hostedtoolcache/Python
-#    - name: Launch script with --help
-#      run: |
-#        ./check_esxi_hardware.py --help
-#  python3-pywbem-014:
-#    runs-on: ubuntu-latest
-#    steps:
-#    - uses: actions/checkout@v1
-#    - uses: actions/setup-python@v1
-#      with:
-#        python-version: '3.x'
-#    - name: Install latest pywbem from pip
-#      run: |
-#        sudo apt-get install -qq -yy python3-pip
-#        pip3 install pywbem==0.14.6
-#    - name: Set environment PYTHONPATH
-#      run: |
-#        export PYTHONPATH=/opt/hostedtoolcache/Python
-#    - name: Launch script with --help
-#      run: |
-#        ./check_esxi_hardware.py --help
-#  find-pywbem:
-#    runs-on: ubuntu-latest
-#    steps:
-#    - uses: actions/checkout@v1
-#    - uses: actions/setup-python@v1
-#      with:
-#        python-version: '3.x'
-#    - name: Install latest pywbem from pip
-#      run: |
-#        sudo apt-get install -qq -yy python-pip
-#        pip install pywbem
-#    - name: Find pywbem module
-#      run: |
-#        find / -name 'pywbem-*'

check_esxi_hardware.py

@@ -264,9 +264,6 @@
 #@ Author : Claudio Kuenzler
 #@ Reason : Allow regular expressions from ignore list (-r)
 #@---------------------------------------------------
-#@ Date   : 20190701
-#@ Author : Phil Randal (phil.randal@gmail.com)
-#@ Reason : Fix lookup of warranty info for Dell (again)
 
 from __future__ import print_function
 import sys
@@ -276,7 +273,7 @@ import re
 import pkg_resources
 from optparse import OptionParser,OptionGroup
 
-version = '20190701'
+version = '20190510'
 
 NS = 'root/cimv2'
 hosturl = ''
@@ -448,7 +445,7 @@ def urlised_server_info(vendor, country, server_info):
   #server_inf = server_info
   if vendor == 'dell' :
     # Dell support URLs (idea and tables borrowed from check_openmanage)
-    du = 'http://www.dell.com/support/home/' + dell_country(country) + '04/product-support/product/poweredge-'
+    du = 'http://www.dell.com/support/troubleshooting/' + dell_country(country) + '19/Product/poweredge-'
     if (server_info is not None) :
       p=re.match('(.*)PowerEdge (.*) (.*)',server_info)
       if (p is not None) :
@@ -456,7 +453,7 @@ def urlised_server_info(vendor, country, server_info):
         if md == 'R210 II':
           md='r210-2'
         md=md.lower()
-        server_info = p.group(1) + '<a href="' + du + md + '/">PowerEdge ' + p.group(2)+'</a> ' + p.group(3)
+        server_info = p.group(1) + '<a href="' + du + md + '#ui-tabs-4">PowerEdge ' + p.group(2)+'</a> ' + p.group(3)
   elif vendor == 'hp':
     return server_info
   elif vendor == 'ibm':
@@ -471,8 +468,8 @@ def urlised_server_info(vendor, country, server_info):
 def system_tag_url(vendor,country):
   if vendor == 'dell':
     # Dell support sites
-    supportsite = 'http://www.dell.com/support/home/'
+    supportsite = 'http://www.dell.com/support/troubleshooting/'
-    dellsuffix = '19/product-support/servicetag/'
+    dellsuffix = 'nodhs1/Index?t=warranty&servicetag='
 
     # warranty URLs for different country codes
     return supportsite + dell_country(country) + dellsuffix