feat(recursion): Fixing different recursion issues.

- Fix errors with more complicated folder structure
- Refactor static logging to fine tunable logging
Folder structs like the following will work now:

Folder (Root)
- Folder (Company)
  - Folder (Country)
    - Datacenter Folder
      - Project Folder (Compute Ressource or CCR here)
        - Customer related Folder
          - Production/Dev Folder (Compute Ressource or CCR here)

Author: kremers

.travis.yml

@@ -1,40 +1,56 @@
+---
+
 language: python
-python:
-- 3.6
-cache: pip
-jobs:
+dist: xenial  # required for Python >= 3.7
+sudo: required
+cache:
+  directories:
+    - "$HOME/.cache/pip"
+    - "$HOME/.pyenv"
+matrix:
   include:
-  - language: python
-    python:
-    - '3.6'
-    cache: pip
-    sudo: required
-    script:
-    - pip install -e . -r requirements.txt -r requirements-tests.txt
-    - grep -Rl packagecloud /etc/apt/ |sudo xargs rm -vf
-    - sudo apt-get update && sudo apt-get install -y nodejs npm && npm install -g dockerfilelint
-    - dockerfilelint ./Dockerfile
-    - flake8 vmware_exporter tests
-    - pytest --cov=. tests/unit
-    after_success:
-    - codecov
-  - language: python
-    python: '3.6'
-    cache: pip
-    sudo: required
-    services:
-    - docker
-    script:
-    - pip install -e . -r requirements.txt -r requirements-tests.txt
-    - pytest tests/integration
-    after_success:
-    - git config --global user.name "semantic-release (via TravisCI)"
-    - git config --global user.email "semantic-release@travis"
-    - pip install python-semantic-release
-    - semantic-release publish
-    - semantic-release changelog --post
+    - name: "Python 3.6 Unit-test"
+      python: 3.6
+    - name: "Python 3.7 Unit-test"
+      python: 3.7
+    - name: "Python 3.7 Docker Unit and Integration-test"
+      python: 3.7
+      services:
+        - docker
+      env:
+        - BUILD_SDIST=true
+        - INTEGRATION_TEST=true
+
+install:
+  - pip install -e . -r requirements.txt -r requirements-tests.txt
+  - grep -Rl packagecloud /etc/apt/ |sudo xargs rm -vf
+  - sudo apt-get update && sudo apt-get install -y nodejs npm
+  - npm install -g dockerfilelint
+  - if [ $INTEGRATION_TEST == "true" ]; then
+      pip install python-semantic-release;
+    fi
+
+script:
+  - dockerfilelint ./Dockerfile
+  - flake8 vmware_exporter tests
+  - pytest --cov=. -v tests/unit
+  - if [ $INTEGRATION_TEST == "true" ]; then
+      pytest tests/integration;
+    else
+      echo "Skipped Integration-Tests";
+    fi
+
+after_success:
+  - codecov
+  - if [ $INTEGRATION_TEST == "true" ]; then
+      git config --global user.name "semantic-release (via TravisCI)";
+      git config --global user.email "semantic-release@travis";
+      semantic-release publish;
+      semantic-release changelog --post;
+    fi
+
 env:
   global:
-  - secure: qC8DzqyxBiBBBUGLuNOO2O6XgmUaLhTi1ArfhYxVDjv5vTJvCNO1DpXfFqXJGR3wrRKe1DOddXildOEL7d7xX6Y3b+k3urnPfqnAM/Hvr0djqDWRPuZl89Fg1mrAvBV3LL/ZsrWKHDc3keD/vTcPAsrnJl3MdS5fMKBwEuDmhpnNdGk0Wty357WxWBaz1JYBoGaqbw0JWAAA5UdfyF3aOybRONXcVqnxqSeR43drBLSdAwBJVVhyv3IYX3HRMCP8vXz43LqWK16z8KVPyrwwzE2WXlq+2FypLtM4A/XOssx4M77MefIMC6ydAimLh33gYtaiuO7+fYipLlOlChNO/pxX43FM+7UuKWaL9MWaUvypmOGo+jp/y6PzbIDz/RH4T8mjaswIe22nyTR/Gbtph/58CISGGEtRNKXjE4/OD1gjodcNS2NkwNQimxjHv30rH4X4Z+JYU+I3iobpmWJ5WJsyMnS3jWkRluRgA+8djuRviK4sdIBwk2qC2AGuZ1c6EJbEN7f3sRIgtQMYd1JAiZVwYmRa08hpulvrZAzxqx/PfkaEOBFQrBwISkD2Oq3MGlDSV+sUe53TmRM1KO9y5fC8XnJHRJv5mw+iWaEIImP2muXufdm101oXNzHbs3hC2kYIFD+u1BoVDgWACUIkj2oRxMJ4p3ynlbccALUc8y0=
-  - secure: GWTsOe1CGvEi/n7k+c91UisQAf7UcofZKeO8EI6n0abRPQii0rfMIQ7fS2KFUyR7I/nk02YrZcd1etAGTVthc9K3YrUhM68eu+ztlUX6Sr5SM6PseYWkgf+G0I+IIoCpqSjwL/9J4jTP1hvNlP7nofUbo43OyEEX7ndNr1r8Ab0Zu48VYFj3sb3whMovakEVH5SIUe001Jix4wIZ9TYUNnSReNzMb8M+s/xK+RUnT3SYYutBbw0Dc+wTaaW/A5g1kSK35VZZ7OWN+l1Sc0xCa9tfJYKuxXFuyKmBRe3z1WUk+4yQxbGKQ0s47LpICo2qKm2iYoKVoWAGXBtWKCbLDoVy1tRTE3bcBMFbNsHXHT4+1F6djJjfr8ndFAoLpXyVBPsD3/ik8k7GzC7Gvam1fzCisjPDZFbdUpUCXU5HDrknB6yKNvekkltgkGajS0rzY6UPPiUdGccoXMngrS8FhD7zPxqfCtbK9WYBM5yXZ/kCgCqy0+dMu0+1iUR8h4hoQxonp2c7cAEnHMcd90o0IK8NEZMNpu5b/F+34/wj3cy+QYpE99pF5ztnPQfzUPZzR7rAl/TzesDLFVQceykYNczoD1YDMUFareV+nyzZp/W4gECaRkqgZxxfYcSUXQCaQfHWSvSdHHLaoIMzQi7lL1c6YxmWx8UireQEChbKfyw=
-  - secure: sbOF44qJH2JyblAVIgbVZ/xmIuF9+ypzmyB6EOvbMagAdcySxYEz7BIadIMtP8wWGM2TZQKFxUTJhJblSBbKAKdC/6o6RLUy/MxyCShJafr9NkBhhbLIzYdVGOC5TjswLBXtvNdTbyUgEu6NQnkBjVoBm8FXfhWxRWzJ7SJHSJYMOB8Fnr7gjxiMbenQUJYfRtVowmExrHq0WxyvNMxqKEW4qWFU3AwAZEc7M5hvf+Upju/rnHsBRZrm/RvfRdhQnAXPVaSJXMzy5Msa6KheqswczSSlLTgpUxCF412EXD2rZsjG3sRFMLnokVw983z2Kw4ov3Y7eYHBpmyz7wg9ICD4TdlbbAPJJIgY7lZzYYtt2sQ6DhLwsNZyCCXBGn6b8tmNiOXdRkZJU7aAW6yuXDSx6RZCRNfn4JFFt1o9yzEbea6oKfovB7cy/3d3ty4+3ud9ozXB9G/m7UzsjCvry7gIxEv2rVYtdNeOvslyftXXXzPl4IRJv99WcSmum0nuOpQrlvOzq+1yQNa3ImCRBkFmqUUa34FObzIaGegq4fD3kMKz9N+impQRvNI9WiDqtRvBJTCaP28ibUainxslW4Ep4rcmWo6synf2q6aWTrUPxXl0jvd6eIuCCvWPH7uLXZhL0dYm5ID/9BOCd3TZcvVjBKW0xWkFafNyt2USJto=
+    - secure: qC8DzqyxBiBBBUGLuNOO2O6XgmUaLhTi1ArfhYxVDjv5vTJvCNO1DpXfFqXJGR3wrRKe1DOddXildOEL7d7xX6Y3b+k3urnPfqnAM/Hvr0djqDWRPuZl89Fg1mrAvBV3LL/ZsrWKHDc3keD/vTcPAsrnJl3MdS5fMKBwEuDmhpnNdGk0Wty357WxWBaz1JYBoGaqbw0JWAAA5UdfyF3aOybRONXcVqnxqSeR43drBLSdAwBJVVhyv3IYX3HRMCP8vXz43LqWK16z8KVPyrwwzE2WXlq+2FypLtM4A/XOssx4M77MefIMC6ydAimLh33gYtaiuO7+fYipLlOlChNO/pxX43FM+7UuKWaL9MWaUvypmOGo+jp/y6PzbIDz/RH4T8mjaswIe22nyTR/Gbtph/58CISGGEtRNKXjE4/OD1gjodcNS2NkwNQimxjHv30rH4X4Z+JYU+I3iobpmWJ5WJsyMnS3jWkRluRgA+8djuRviK4sdIBwk2qC2AGuZ1c6EJbEN7f3sRIgtQMYd1JAiZVwYmRa08hpulvrZAzxqx/PfkaEOBFQrBwISkD2Oq3MGlDSV+sUe53TmRM1KO9y5fC8XnJHRJv5mw+iWaEIImP2muXufdm101oXNzHbs3hC2kYIFD+u1BoVDgWACUIkj2oRxMJ4p3ynlbccALUc8y0=
+    - secure: GWTsOe1CGvEi/n7k+c91UisQAf7UcofZKeO8EI6n0abRPQii0rfMIQ7fS2KFUyR7I/nk02YrZcd1etAGTVthc9K3YrUhM68eu+ztlUX6Sr5SM6PseYWkgf+G0I+IIoCpqSjwL/9J4jTP1hvNlP7nofUbo43OyEEX7ndNr1r8Ab0Zu48VYFj3sb3whMovakEVH5SIUe001Jix4wIZ9TYUNnSReNzMb8M+s/xK+RUnT3SYYutBbw0Dc+wTaaW/A5g1kSK35VZZ7OWN+l1Sc0xCa9tfJYKuxXFuyKmBRe3z1WUk+4yQxbGKQ0s47LpICo2qKm2iYoKVoWAGXBtWKCbLDoVy1tRTE3bcBMFbNsHXHT4+1F6djJjfr8ndFAoLpXyVBPsD3/ik8k7GzC7Gvam1fzCisjPDZFbdUpUCXU5HDrknB6yKNvekkltgkGajS0rzY6UPPiUdGccoXMngrS8FhD7zPxqfCtbK9WYBM5yXZ/kCgCqy0+dMu0+1iUR8h4hoQxonp2c7cAEnHMcd90o0IK8NEZMNpu5b/F+34/wj3cy+QYpE99pF5ztnPQfzUPZzR7rAl/TzesDLFVQceykYNczoD1YDMUFareV+nyzZp/W4gECaRkqgZxxfYcSUXQCaQfHWSvSdHHLaoIMzQi7lL1c6YxmWx8UireQEChbKfyw=
+    - secure: sbOF44qJH2JyblAVIgbVZ/xmIuF9+ypzmyB6EOvbMagAdcySxYEz7BIadIMtP8wWGM2TZQKFxUTJhJblSBbKAKdC/6o6RLUy/MxyCShJafr9NkBhhbLIzYdVGOC5TjswLBXtvNdTbyUgEu6NQnkBjVoBm8FXfhWxRWzJ7SJHSJYMOB8Fnr7gjxiMbenQUJYfRtVowmExrHq0WxyvNMxqKEW4qWFU3AwAZEc7M5hvf+Upju/rnHsBRZrm/RvfRdhQnAXPVaSJXMzy5Msa6KheqswczSSlLTgpUxCF412EXD2rZsjG3sRFMLnokVw983z2Kw4ov3Y7eYHBpmyz7wg9ICD4TdlbbAPJJIgY7lZzYYtt2sQ6DhLwsNZyCCXBGn6b8tmNiOXdRkZJU7aAW6yuXDSx6RZCRNfn4JFFt1o9yzEbea6oKfovB7cy/3d3ty4+3ud9ozXB9G/m7UzsjCvry7gIxEv2rVYtdNeOvslyftXXXzPl4IRJv99WcSmum0nuOpQrlvOzq+1yQNa3ImCRBkFmqUUa34FObzIaGegq4fD3kMKz9N+impQRvNI9WiDqtRvBJTCaP28ibUainxslW4Ep4rcmWo6synf2q6aWTrUPxXl0jvd6eIuCCvWPH7uLXZhL0dYm5ID/9BOCd3TZcvVjBKW0xWkFafNyt2USJto=

README.md

@@ -19,6 +19,8 @@ Get VMware vCenter information:
 
 ## Usage
 
+*Requires Python >= 3.6*
+
 - Install with `$ python setup.py install` or via pip `$ pip install vmware_exporter`. The docker command below is preferred.
 - Create `config.yml` based on the configuration section. Some variables can be passed as environment variables
 - Run `$ vmware_exporter -c /path/to/your/config`

tests/unit/test_vmware_exporter.py

@@ -7,6 +7,7 @@
 import pytz
 from pyVmomi import vim, vmodl
 from twisted.internet import defer
+from twisted.internet.error import ReactorAlreadyRunning
 from twisted.web.server import NOT_DONE_YET
 
 from vmware_exporter.vmware_exporter import main, HealthzResource, VmwareCollector, VMWareMetricsResource
@@ -526,19 +527,19 @@ def _fake_get_vms(*args, **kwargs):
 
 @pytest_twisted.inlineCallbacks
 def test_vmware_get_inventory():
-    content = mock.Mock()
+    content = mock.Mock(spec=vim.ServiceInstanceContent)
 
     # Compute case 1
-    host_1 = mock.Mock()
+    host_1 = mock.Mock(spec=vim.HostSystem)
     host_1._moId = 'host:1'
     host_1.name = 'host-1'
     host_1.summary.config.name = 'host-1.'
 
-    folder_1 = mock.Mock()
+    folder_1 = mock.Mock(spec=vim.ComputeResource)
     folder_1.host = [host_1]
 
     # Computer case 2
-    host_2 = mock.Mock()
+    host_2 = mock.Mock(spec=vim.HostSystem)
     host_2._moId = 'host:2'
     host_2.name = 'host-2'
     host_2.summary.config.name = 'host-2.'
@@ -548,12 +549,12 @@ def test_vmware_get_inventory():
     folder_2.__dict__['host'] = [host_2]
 
     # Folders case
-    host_3 = mock.Mock()
+    host_3 = mock.Mock(spec=vim.HostSystem)
     host_3._moId = 'host:3'
     host_3.name = 'host-3'
     host_3.summary.config.name = 'host-3.'
 
-    folder_3 = mock.Mock()
+    folder_3 = mock.Mock(spec=vim.ComputeResource)
     folder_3.host = [host_3]
 
     folder_4 = vim.Folder('folder:4')
@@ -576,12 +577,20 @@ def test_vmware_get_inventory():
     datastore_2_folder.__dict__['childEntity'] = [datastore_2]
     datastore_2_folder.__dict__['name'] = 'datastore2-folder'
 
-    data_center_1 = mock.Mock()
+    data_center_1 = mock.Mock(spec=vim.Datacenter)
     data_center_1.name = 'dc-1'
-    data_center_1.hostFolder.childEntity = [folder_1, folder_2, folder_5]
-    data_center_1.datastoreFolder.childEntity = [datastore_1, datastore_2_folder]
+    data_center_1_hostfolder = mock.Mock(spec=vim.Folder)
+    data_center_1_hostfolder.childEntity = [folder_1, folder_2, folder_5]
+    data_center_1.hostFolder = data_center_1_hostfolder
+
+    dc1_datastoreFolder = mock.Mock(spec=vim.Folder)
+    dc1_datastoreFolder.childEntity = [datastore_1, datastore_2_folder]
 
-    content.rootFolder.childEntity = [data_center_1]
+    data_center_1.datastoreFolder = dc1_datastoreFolder
+
+    rootFolder1 = mock.Mock(spec=vim.Folder)
+    rootFolder1.childEntity = [data_center_1]
+    content.rootFolder = rootFolder1
 
     collect_only = {
         'vms': True,
@@ -895,6 +904,16 @@ def test_config_env_multiple_sections():
     }
 
 
+def test_invalid_loglevel_cli_argument():
+    with pytest.raises(ValueError):
+        main(['-l', 'dog'])
+
+
+def test_valid_loglevel_cli_argument():
+    with pytest.raises(ReactorAlreadyRunning):
+        main(['-l', 'INFO'])
+
+
 def test_main():
     with pytest.raises(SystemExit):
-        main(['-h'])
+        main(['-h', '-l debug'])