HewlettPackard · SHANDCRUZ · Dec 1, 2020 · Dec 1, 2020 · Dec 1, 2020 · Dec 1, 2020
diff --git a/.github/workflows/.ansible-test.yml b/.github/workflows/.ansible-test.yml
@@ -25,8 +25,8 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install future
-          if [ -f tests/requirements.txt ]; then pip install -r tests/requirements.txt; fi
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+          if [ -f tests/requirements.txt ]; then pip install -r tests/requirements.txt; fi
 
       - name: Install ansible ${{ matrix.ansible_version }}
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible_version }}.tar.gz --disable-pip-version-check
@@ -36,3 +36,50 @@ jobs:
 
       - name: Run sanity tests
         run: ansible-test sanity --docker -v --color --python ${{ matrix.python_version }}
+
+  units:
+    runs-on: ubuntu-latest
+    name: Units (Ⓐ${{ matrix.ansible }})
+    strategy:
+      # As soon as the first unit test fails, cancel the others to free up the CI queue
+      fail-fast: true
+      matrix:
+        python_version:
+          - 3.6
+          - 3.7
+        ansible:
+          - stable-2.10
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v1
+        with:
+          path: ansible_collections/hpe/oneview
+
+      - name: Set up Python ${{ matrix.python_version }}
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python_version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip3 install future
+          pip3 install -r tests/requirements.txt
+          if [ -f requirements.txt ]; then pip3 install -r requirements.txt; fi
+
+      - name: Install ansible-base (${{ matrix.ansible }})
+        run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
+
+      - name: Run unit tests
+        run: pytest
+
+      - name: Generate coverage report
+        run: ansible-test coverage xml -v --requirements --group-by command --group-by version
+        working-directory: ./ansible_collections/hpe/oneview
+
+      # See the reports at https://codecov.io/gh/ansible_collections/hpe.oneview
+      - uses: codecov/codecov-action@v1
+        with:
+          fail_ci_if_error: false
+
diff --git a/plugins/__init__.py b/plugins/__init__.py
diff --git a/plugins/modules/__init__.py b/plugins/modules/__init__.py
diff --git a/plugins/modules/image_streamer_artifact_bundle.py b/plugins/modules/image_streamer_artifact_bundle.py
@@ -166,7 +166,7 @@
 '''
 
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule, OneViewModuleResourceNotFound, compare
+from plugins.module_utils.oneview import OneViewModule, OneViewModuleResourceNotFound, compare
 
 
 class ArtifactBundleModule(OneViewModule):

diff --git a/plugins/modules/image_streamer_artifact_bundle_facts.py b/plugins/modules/image_streamer_artifact_bundle_facts.py
@@ -109,7 +109,7 @@
     type: list
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class ArtifactBundleFactsModule(OneViewModule):

diff --git a/plugins/modules/image_streamer_build_plan.py b/plugins/modules/image_streamer_build_plan.py
@@ -96,7 +96,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModuleBase, OneViewModuleValueError
+from plugins.module_utils.oneview import OneViewModuleBase, OneViewModuleValueError
 
 
 class BuildPlanModule(OneViewModuleBase):

diff --git a/plugins/modules/image_streamer_build_plan_facts.py b/plugins/modules/image_streamer_build_plan_facts.py
@@ -96,7 +96,7 @@
     type: list
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModuleBase, OneViewModuleResourceNotFound
+from plugins.module_utils.oneview import OneViewModuleBase, OneViewModuleResourceNotFound
 
 
 class BuildPlanFactsModule(OneViewModuleBase):

diff --git a/plugins/modules/image_streamer_deployment_group_facts.py b/plugins/modules/image_streamer_deployment_group_facts.py
@@ -93,7 +93,7 @@
     type: list
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModuleBase, OneViewModuleResourceNotFound
+from plugins.module_utils.oneview import OneViewModuleBase, OneViewModuleResourceNotFound
 
 
 class DeploymentGroupFactsModule(OneViewModuleBase):

diff --git a/plugins/modules/image_streamer_deployment_plan.py b/plugins/modules/image_streamer_deployment_plan.py
@@ -101,7 +101,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule, OneViewModuleResourceNotFound
+from plugins.module_utils.oneview import OneViewModule, OneViewModuleResourceNotFound
 
 
 class DeploymentPlanModule(OneViewModule):

diff --git a/plugins/modules/image_streamer_deployment_plan_facts.py b/plugins/modules/image_streamer_deployment_plan_facts.py
@@ -129,7 +129,7 @@
     type: list
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class DeploymentPlanFactsModule(OneViewModule):

diff --git a/plugins/modules/image_streamer_golden_image.py b/plugins/modules/image_streamer_golden_image.py
@@ -134,7 +134,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModuleBase, OneViewModuleValueError, OneViewModuleResourceNotFound, compare
+from plugins.module_utils.oneview import OneViewModuleBase, OneViewModuleValueError, OneViewModuleResourceNotFound, compare
 
 
 class GoldenImageModule(OneViewModuleBase):

diff --git a/plugins/modules/image_streamer_golden_image_facts.py b/plugins/modules/image_streamer_golden_image_facts.py
@@ -95,7 +95,7 @@
     type: list
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModuleBase
+from plugins.module_utils.oneview import OneViewModuleBase
 
 
 class GoldenImageFactsModule(OneViewModuleBase):

diff --git a/plugins/modules/image_streamer_os_volume_facts.py b/plugins/modules/image_streamer_os_volume_facts.py
@@ -146,7 +146,7 @@
     type: str
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModuleBase
+from plugins.module_utils.oneview import OneViewModuleBase
 
 
 class OsVolumeFactsModule(OneViewModuleBase):

diff --git a/plugins/modules/image_streamer_plan_script.py b/plugins/modules/image_streamer_plan_script.py
@@ -121,7 +121,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModuleBase, OneViewModuleValueError
+from plugins.module_utils.oneview import OneViewModuleBase, OneViewModuleValueError
 
 
 class PlanScriptModule(OneViewModuleBase):

diff --git a/plugins/modules/image_streamer_plan_script_facts.py b/plugins/modules/image_streamer_plan_script_facts.py
@@ -105,7 +105,7 @@
     type: list
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModuleBase
+from plugins.module_utils.oneview import OneViewModuleBase
 
 
 class PlanScriptFactsModule(OneViewModuleBase):

diff --git a/plugins/modules/oneview_appliance_configuration_timeconfig_facts.py b/plugins/modules/oneview_appliance_configuration_timeconfig_facts.py
@@ -57,7 +57,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class ApplianceConfigurationTimeconfigFactsModule(OneViewModule):
@@ -68,7 +68,7 @@ def __init__(self):
     def execute_module(self):
         appliance_configuration_timeconfig = self.resource_client.get_all()
         return dict(changed=False,
-                    ansible_facts=dict(appliance_configuration_timeconfig=appliance_configuration_timeconfig))
+                    ansible_facts=dict(appliance_configuration_timeconfig=appliance_configuration_timeconfig.data))
 
 
 def main():

diff --git a/...liance_device_snmp_v1_trap_destination.py → ...iance_device_snmp_v1_trap_destinations.py b/...liance_device_snmp_v1_trap_destination.py → ...iance_device_snmp_v1_trap_destinations.py
@@ -114,7 +114,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class ApplianceDeviceSnmpV1TrapDestinationsModule(OneViewModule):

diff --git a/..._device_snmp_v1_trap_destination_facts.py → ...device_snmp_v1_trap_destinations_facts.py b/..._device_snmp_v1_trap_destination_facts.py → ...device_snmp_v1_trap_destinations_facts.py
@@ -112,7 +112,7 @@
 '''
 
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class ApplianceDeviceSnmpV1TrapDestinationsFactsModule(OneViewModule):

diff --git a/...liance_device_snmp_v3_trap_destination.py → ...iance_device_snmp_v3_trap_destinations.py b/...liance_device_snmp_v3_trap_destination.py → ...iance_device_snmp_v3_trap_destinations.py
@@ -107,7 +107,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule, OneViewModuleException, \
+from plugins.module_utils.oneview import OneViewModule, OneViewModuleException, \
     OneViewModuleValueError, OneViewModuleResourceNotFound
 
 

diff --git a/..._device_snmp_v3_trap_destination_facts.py → ...device_snmp_v3_trap_destinations_facts.py b/..._device_snmp_v3_trap_destination_facts.py → ...device_snmp_v3_trap_destinations_facts.py
@@ -112,7 +112,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class ApplianceDeviceSnmpV3TrapDestinationsFactsModule(OneViewModule):

diff --git a/plugins/modules/oneview_appliance_device_snmp_v3_users.py b/plugins/modules/oneview_appliance_device_snmp_v3_users.py
@@ -108,7 +108,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import (
+from plugins.module_utils.oneview import (
     OneViewModule, OneViewModuleException,
     OneViewModuleValueError, OneViewModuleResourceNotFound
 )

diff --git a/plugins/modules/oneview_appliance_device_snmp_v3_users_facts.py b/plugins/modules/oneview_appliance_device_snmp_v3_users_facts.py
@@ -96,7 +96,7 @@
     returned: Always.
     type: dict
 '''
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class ApplianceDeviceSnmpV3UsersFactsModule(OneViewModule):

diff --git a/plugins/modules/oneview_appliance_ssh_access.py b/plugins/modules/oneview_appliance_ssh_access.py
@@ -87,7 +87,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class ApplianceSshAccessModule(OneViewModule):

diff --git a/plugins/modules/oneview_appliance_ssh_access_facts.py b/plugins/modules/oneview_appliance_ssh_access_facts.py
@@ -59,7 +59,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class ApplianceSshAccessFactsModule(OneViewModule):
@@ -69,9 +69,8 @@ def __init__(self):
 
     def execute_module(self):
         appliance_ssh_access = self.resource_client.get_all()
-        appliance_ssh_access = appliance_ssh_access.data
         return dict(changed=False,
-                    ansible_facts=dict(appliance_ssh_access=appliance_ssh_access))
+                    ansible_facts=dict(appliance_ssh_access=appliance_ssh_access.data))
 
 
 def main():

diff --git a/plugins/modules/oneview_appliance_time_and_locale_configuration.py b/plugins/modules/oneview_appliance_time_and_locale_configuration.py
@@ -73,7 +73,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule, compare
+from plugins.module_utils.oneview import OneViewModule, compare
 
 
 class ApplianceTimeAndLocaleConfigurationModule(OneViewModule):

diff --git a/plugins/modules/oneview_appliance_time_and_locale_configuration_facts.py b/plugins/modules/oneview_appliance_time_and_locale_configuration_facts.py
@@ -58,7 +58,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class ApplianceTimeAndLocaleConfigurationFactsModule(OneViewModule):

diff --git a/plugins/modules/oneview_certificates_server.py b/plugins/modules/oneview_certificates_server.py
@@ -103,7 +103,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class CertificatesServerModule(OneViewModule):

diff --git a/plugins/modules/oneview_certificates_server_facts.py b/plugins/modules/oneview_certificates_server_facts.py
@@ -74,7 +74,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class CertificatesServerFactsModule(OneViewModule):

diff --git a/plugins/modules/oneview_connection_template.py b/plugins/modules/oneview_connection_template.py
@@ -78,7 +78,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import (OneViewModule, OneViewModuleValueError,
+from plugins.module_utils.oneview import (OneViewModule, OneViewModuleValueError,
                                                                           OneViewModuleResourceNotFound, compare)
 
 

diff --git a/plugins/modules/oneview_connection_template_facts.py b/plugins/modules/oneview_connection_template_facts.py
@@ -113,7 +113,7 @@
 '''
 
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class ConnectionTemplateFactsModule(OneViewModule):

diff --git a/plugins/modules/oneview_enclosure.py b/plugins/modules/oneview_enclosure.py
@@ -396,7 +396,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import (OneViewModule, OneViewModuleResourceNotFound, OneViewModuleValueError)
+from plugins.module_utils.oneview import (OneViewModule, OneViewModuleResourceNotFound, OneViewModuleValueError)
 
 
 class EnclosureModule(OneViewModule):

diff --git a/plugins/modules/oneview_enclosure_facts.py b/plugins/modules/oneview_enclosure_facts.py
@@ -153,7 +153,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class EnclosureFactsModule(OneViewModule):

diff --git a/plugins/modules/oneview_enclosure_group.py b/plugins/modules/oneview_enclosure_group.py
@@ -107,7 +107,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class EnclosureGroupModule(OneViewModule):

diff --git a/plugins/modules/oneview_enclosure_group_facts.py b/plugins/modules/oneview_enclosure_group_facts.py
@@ -109,7 +109,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class EnclosureGroupFactsModule(OneViewModule):

diff --git a/plugins/modules/oneview_ethernet_network.py b/plugins/modules/oneview_ethernet_network.py
@@ -176,7 +176,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule, OneViewModuleResourceNotFound, compare
+from plugins.module_utils.oneview import OneViewModule, OneViewModuleResourceNotFound, compare
 
 
 class EthernetNetworkModule(OneViewModule):

diff --git a/plugins/modules/oneview_ethernet_network_facts.py b/plugins/modules/oneview_ethernet_network_facts.py
@@ -121,7 +121,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class EthernetNetworkFactsModule(OneViewModule):

diff --git a/plugins/modules/oneview_fc_network.py b/plugins/modules/oneview_fc_network.py
@@ -107,7 +107,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule, compare
+from plugins.module_utils.oneview import OneViewModule, compare
 
 
 class FcNetworkModule(OneViewModule):

diff --git a/plugins/modules/oneview_fc_network_facts.py b/plugins/modules/oneview_fc_network_facts.py
@@ -88,7 +88,7 @@
     type: dict
 '''
 
-from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule
+from plugins.module_utils.oneview import OneViewModule
 
 
 class FcNetworkFactsModule(OneViewModule):
-Original file line number
+Diff line change
@@ Expand Up / @@ -166,7 +166,7 @@ @@
     '''
-    from ansible_collections.hpe.oneview.plugins.module_utils.oneview import OneViewModule, OneViewModuleResourceNotFound, compare
+    from plugins.module_utils.oneview import OneViewModule, OneViewModuleResourceNotFound, compare
     class ArtifactBundleModule(OneViewModule):
@@ Expand Down @@