Repository: HewlettPackard/oneview-python (language: python)

Issue:
Release/5.0.0
### Description
Moving code from old repo to new repo

### Check List
- [x] New functionality includes testing.
  - [x] All tests pass for Python 2.7+ & 3.4+(`$ tox`).
- [x] New functionality has been documented in the README if applicable.
  - [x] New functionality has been thoroughly documented in the examples (please include helpful comments).
  - [x] New endpoints supported are updated in the endpoints-support.md file.
- [x] Changes are documented in the CHANGELOG.


Discussion / hints:

Fix patch:
diff --git a/examples/config-rename.json b/examples/config-rename.json
index a28adf80d..e109f491c 100644
--- a/examples/config-rename.json
+++ b/examples/config-rename.json
@@ -1,6 +1,5 @@
 {
   "ip": "",
-  "image_streamer_ip": "",
   "api_version": 3400,
   "ssl_certificate": "",
   "credentials": {
diff --git a/examples/hypervisor_cluster_profiles.py b/examples/hypervisor_cluster_profiles.py
index 0e70b4dfa..5aa5138d6 100644
--- a/examples/hypervisor_cluster_profiles.py
+++ b/examples/hypervisor_cluster_profiles.py
@@ -15,7 +15,7 @@
 # limitations under the License.
 ###
 
-# This example requires a ServerProfileTemplate with name "spt_hcp" and HypervisorManager
+# This example requires a ServerProfileTemplate with name "ProfileTemplate-1" and HypervisorManager
 # with name "172.18.13.11"
 
 from pprint import pprint
@@ -37,16 +37,13 @@
 hypervisor_cluster_profiles = oneview_client.hypervisor_cluster_profiles
 hypervisor_managers = oneview_client.hypervisor_managers
 profile_templates = oneview_client.server_profile_templates
-os_deployment_plans = oneview_client.os_deployment_plans
 
 hypervisor_manager = "172.18.13.11"
 spt_name = "ProfileTemplate-1"  # spt without os deployment plan and one mgmt connection
-deployment_plan = "Basic Deployment Plan"
 
 # Getting the uris from name
 hyp_mgr_uri = hypervisor_managers.get_by_name(hypervisor_manager).data['uri']
 spt_uri = profile_templates.get_by_name(spt_name).data['uri']
-dp_uri = os_deployment_plans.get_by_name(deployment_plan).data['uri']
 
 options = {
     "name": "Test_cluster_profile",
@@ -61,11 +58,6 @@
     },
     "hypervisorHostProfileTemplate": {
         "serverProfileTemplateUri": spt_uri,
-        "deploymentPlan": {
-            "deploymentPlanUri": dp_uri,
-            "serverPassword": "",
-            "deploymentCustomArgs": []
-        },
         "hostprefix": "Test_cluster_profile",
         "virtualSwitches": [],
         "hostConfigPolicy": {
@@ -73,9 +65,11 @@
             "useHostnameToRegister": False
         },
         "virtualSwitchConfigPolicy": {
-            "manageVirtualSwitches": True,
+            "manageVirtualSwitches": False,
             "configurePortGroups": True
-        }
+        },
+        "dataStoreNameSync": True,
+        "deploymentManagerType": "UserManaged"
     },
     "mgmtIpSettingsOverride": None,
     "hypervisorManagerUri": hyp_mgr_uri,
diff --git a/examples/image_streamer/__init__.py b/examples/image_streamer/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/examples/image_streamer/artifact_bundles.py b/examples/image_streamer/artifact_bundles.py
deleted file mode 100644
index 95229eeb7..000000000
--- a/examples/image_streamer/artifact_bundles.py
+++ /dev/null
@@ -1,143 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2021] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-import os
-from pprint import pprint
-from hpeOneView.oneview_client import OneViewClient
-
-EXAMPLE_CONFIG_FILE = os.path.join(os.path.dirname(__file__), '../config.json')
-
-oneview_client = OneViewClient.from_json_file(EXAMPLE_CONFIG_FILE)
-image_streamer_client = oneview_client.create_image_streamer_client()
-artifact_bundles = image_streamer_client.artifact_bundles
-build_plans = image_streamer_client.build_plans
-deployment_groups = image_streamer_client.deployment_groups
-
-artifact_bundles_to_be_created = {
-    "name": "Artifact Bundles Test",
-    "description": "Description of Artifact Bundles Test",
-    "buildPlans": [
-        {
-            "resourceUri": "/rest/build-plans/81088ef9-631d-4c5c-9de1-026afa234bc8",
-            "readOnly": "false"
-        }
-    ]
-}
-
-artifact_bundles_deployment_group = {
-    "deploymentGroupURI": "/rest/deployment-groups/2117634b-d911-4673-98ac-1a7e19f3b40f"
-}
-
-# Get all deployment groups
-all_dp_groups = deployment_groups.get_all()
-dp_group_uri = all_dp_groups[0]['uri']
-
-# Get all build plans
-all_bps = build_plans.get_all()
-bp_uri = all_bps[0]['uri']
-
-# set the uri in payload
-artifact_bundles_deployment_group["deploymentGroupURI"] = dp_group_uri
-artifact_bundles_to_be_created["buildPlans"][0]["resourceUri"] = bp_uri
-
-artifact_bundle_file_path = {
-    "download": "./artifact_bundle.zip",
-    "download_archive": "./archive.zip",
-    "upload": "./artifact_bundle.zip",
-    "upload_backup": "./archive.zip"
-}
-
-artifact_bundle_new_name = "Artifact Bundles Test Updated"
-
-# Get all Artifacts Bundle
-print("\nGet all Artifact Bundles")
-all_artifact_bundles = artifact_bundles.get_all()
-for artifacts_bundle in all_artifact_bundles:
-    print(" - {}".format(artifacts_bundle['name']))
-
-# Get the Artifacts Bundle by Name
-print("\nGet Artifact Bundles by Name")
-artifact_bundle = artifact_bundles.get_by_name(artifact_bundles_to_be_created['name'])
-
-if artifact_bundle:
-    print("Found artifact bundle with name- {} and uri- {}".format(artifact_bundle.data['name'], artifact_bundle.data['uri']))
-else:
-    # Create an Artifact Bundle
-    print("\nCreate an Artifact Bundle")
-    artifact_bundle = artifact_bundles.create(artifact_bundles_to_be_created)
-    print("Created artifact bundle with name- {} and uri- {}".format(artifact_bundle.data['name'], artifact_bundle.data['uri']))
-
-# Get the Artifacts Bundle by uri
-print("\nGet the Artifact Bundle by uri")
-ab_by_uri = artifact_bundles.get_by_uri(artifact_bundle.data['uri'])
-print(ab_by_uri.data)
-
-# Download the Artifact Bundle
-print("\nDownload the Artifact Bundle")
-response = artifact_bundle.download(artifact_bundle_file_path['download'])
-print(response)
-
-# Update name of an Artifact Bundle
-print("\nUpdate an Artifact Bundle")
-data_to_update = {'name': artifact_bundle_new_name}
-artifact_bundle.update(data=data_to_update)
-pprint(artifact_bundle.data)
-
-# Extract an Artifact Bundle
-print("\nExtract an Artifact Bundle")
-response = artifact_bundle.extract()
-pprint(response)
-
-# Delete an Artifact Bundle
-print("\nDelete an Artifact Bundle")
-artifact_bundle.delete()
-
-# Create a Backup for all the Artifact Bundle
-print("\nCreate a Backup for all Artifact Bundles")
-ab_backup = artifact_bundles.create_backup(artifact_bundles_deployment_group)
-print(ab_backup.data)
-
-# Get all Backups Bundles
-print("\nGet all Backups Bundles")
-backup_artifact_bundles = artifact_bundles.get_all_backups()
-for backup in backup_artifact_bundles:
-    print(" - {}".format(backup['name']))
-
-# Get Backup Bundle
-print("\nGet Backup Bundle")
-ab_bkp = artifact_bundles.get_backup(backup_artifact_bundles[0]['uri'])
-pprint(ab_bkp.data)
-
-# Extract an Artifact Bundle from backup
-print("\nExtract an Artifact Bundle from Backup")
-response = ab_bkp.extract_backup(artifact_bundles_deployment_group)
-pprint(response)
-
-# Download the backup archive of the Artifact Bundle
-print("\nDownload the backup archive of the Artifact Bundle")
-response = ab_bkp.download_archive(artifact_bundle_file_path['download_archive'])
-print(response)
-
-# Upload an Artifact Bundle from file
-print("\nUpload an Artifact Bundle from file")
-response = artifact_bundles.upload_bundle_from_file(artifact_bundle_file_path['upload'])
-pprint(response)
-
-# Upload a Backup of Artifact Bundle from file
-print("\nUpload a Backup of Artifact Bundle from file")
-res = artifact_bundles.upload_backup_bundle_from_file(artifact_bundle_file_path['upload_backup'], artifact_bundles_deployment_group['deploymentGroupURI'])
-pprint(res)
diff --git a/examples/image_streamer/build_plans.py b/examples/image_streamer/build_plans.py
deleted file mode 100644
index 2cf01d69b..000000000
--- a/examples/image_streamer/build_plans.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2019] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-import os
-from pprint import pprint
-from hpeOneView.oneview_client import OneViewClient
-
-EXAMPLE_CONFIG_FILE = os.path.join(os.path.dirname(__file__), '../config.json')
-
-oneview_client = OneViewClient.from_json_file(EXAMPLE_CONFIG_FILE)
-
-image_streamer_client = oneview_client.create_image_streamer_client()
-
-build_plan_information = {
-    "name": "Demo Build Plan",
-    "oeBuildPlanType": "deploy"
-}
-
-# Create a Build Plan
-print("Create an OS Build Plan")
-build_plan_created = image_streamer_client.build_plans.create(build_plan_information)
-pprint(build_plan_created)
-
-# Update the Build Plan
-print("\nUpdate the OS Build Plan")
-build_plan_created["name"] = "Demo Build Plan - Renamed"
-build_plan_updated = image_streamer_client.build_plans.update(build_plan_created)
-pprint(build_plan_updated)
-
-# Get the Build Plan by URI
-print("\nGet the OS Build Plan by URI")
-build_plan_by_uri = image_streamer_client.build_plans.get(build_plan_updated['uri'])
-pprint(build_plan_by_uri)
-
-# Get all Build Plans
-print("\nGet all OS Build Plans")
-build_plans = image_streamer_client.build_plans.get_all()
-for build_plan in build_plans:
-    print(build_plan['name'])
-
-# Delete the Build Plan
-print("\nDelete the OS Build Plan")
-image_streamer_client.build_plans.delete(build_plan_by_uri)
-print("OS Build Plan deleted successfully")
diff --git a/examples/image_streamer/deployment_groups.py b/examples/image_streamer/deployment_groups.py
deleted file mode 100644
index a3b10654f..000000000
--- a/examples/image_streamer/deployment_groups.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2021] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-import os
-from pprint import pprint
-from hpeOneView.oneview_client import OneViewClient
-
-EXAMPLE_CONFIG_FILE = os.path.join(os.path.dirname(__file__), '../config.json')
-
-oneview_client = OneViewClient.from_json_file(EXAMPLE_CONFIG_FILE)
-
-image_streamer_client = oneview_client.create_image_streamer_client()
-
-deployment_groups_information = {
-    "name": "OSS",
-}
-
-
-# Get all Deployment Groups
-print("\nGet all Deployment Groups")
-deployment_groups = image_streamer_client.deployment_groups.get_all()
-for deployment_group in deployment_groups:
-    pprint(deployment_group)
-
-# Get the ID of Deployment Group
-deployment_groups_information['id'] = deployment_groups[0]['uri'].split('/')[-1]
-
-# Get the Deployment Group by ID
-print("\nGet the Deployment Group by ID")
-response = image_streamer_client.deployment_groups.get(deployment_groups_information['id'])
-pprint(response)
-
-
-# Get the Deployment Group by Name
-print("\nGet the Deployment Group by Name")
-response = image_streamer_client.deployment_groups.get_by_name(deployment_groups_information['name'])
-pprint(response)
diff --git a/examples/image_streamer/deployment_plans.py b/examples/image_streamer/deployment_plans.py
deleted file mode 100644
index 59a30ae54..000000000
--- a/examples/image_streamer/deployment_plans.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2021] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-import os
-from pprint import pprint
-from hpeOneView.oneview_client import OneViewClient
-
-EXAMPLE_CONFIG_FILE = os.path.join(os.path.dirname(__file__), '../config.json')
-
-oneview_client = OneViewClient.from_json_file(EXAMPLE_CONFIG_FILE)
-image_streamer_client = oneview_client.create_image_streamer_client()
-deployment_plans = image_streamer_client.deployment_plans
-build_plans = image_streamer_client.build_plans
-
-# To run this example set a valid Build Plan URI
-deployment_plan_information = {
-    "name": "Demo Deployment Plan",
-    "description": "",
-    "hpProvided": "false",
-    "oeBuildPlanURI": "/rest/build-plans/134b7e3f-4305-47c4-8d15-44d265697bf0",
-}
-
-# Get all build plans
-all_build_plans = build_plans.get_all(filter='oeBuildPlanType=capture')
-bp_uri = all_build_plans[0]['uri']
-
-# set the "oeBuildPlanURI" in deployment plan payload
-deployment_plan_information['oeBuildPlanURI'] = bp_uri
-
-if oneview_client.api_version >= 500:
-    deployment_plan_information["type"] = "OEDeploymentPlanV5"
-
-# Create a Deployment Plan
-print("Create a Deployment Plan")
-deployment_plan_created = deployment_plans.create(deployment_plan_information)
-pprint(deployment_plan_created.data)
-
-# Update the Deployment Plan
-print("\nUpdate the Deployment Plan")
-deployment_plan_data = deployment_plan_created.data.copy()
-deployment_plan_data["name"] = "Demo Deployment Plan - Renamed"
-deployment_plan_created.update(deployment_plan_data)
-pprint(deployment_plan_created.data)
-
-# Get the Deployment Plan by URI
-print("\nGet the Deployment Plan by URI")
-deployment_plan_by_uri = deployment_plans.get_by_uri(deployment_plan_created.data['uri'])
-pprint(deployment_plan_by_uri.data)
-
-# Get the Deployment Plan by name
-print("\nGet the Deployment Plan by name")
-deployment_plan_by_name = deployment_plans.get_by_name(deployment_plan_created.data['name'])
-pprint(deployment_plan_by_name.data)
-
-# Get all Deployment Plans
-print("\nGet all Deployment Plans")
-deployment_plans_all = deployment_plans.get_all()
-for deployment_plan in deployment_plans_all:
-    print(deployment_plan['name'])
-
-if oneview_client.api_version >= 500:
-    # Get the list of ServerProfile and ServerProfileTemplate URI that are using OEDP {id}
-    print("\nGet the list of ServerProfile and ServerProfileTemplate URI that are using OEDP {id}")
-    deployment_usedby = deployment_plan_created.get_usedby()
-    pprint(deployment_usedby)
-
-if oneview_client.api_version >= 600:
-    # Get the list of ServerProfile and ServerProfileTemplate URI that are using OEDP {id}
-    print("\nGet the OSDP of a Deployment Plan ")
-    deployment_osdp = deployment_plan_created.get_osdp()
-    pprint(deployment_osdp)
-
-# Delete the Deployment Plan
-print("\nDelete the Deployment Plan")
-deployment_plan_created.delete()
-print("Deployment Plan deleted successfully")
diff --git a/examples/image_streamer/golden_images.py b/examples/image_streamer/golden_images.py
deleted file mode 100644
index d3de727ed..000000000
--- a/examples/image_streamer/golden_images.py
+++ /dev/null
@@ -1,108 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2021] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-import os
-from pprint import pprint
-from hpeOneView.oneview_client import OneViewClient
-
-EXAMPLE_CONFIG_FILE = os.path.join(os.path.dirname(__file__), '../config.json')
-
-oneview_client = OneViewClient.from_json_file(EXAMPLE_CONFIG_FILE)
-
-image_streamer_client = oneview_client.create_image_streamer_client()
-
-# Get the OS volume and build plan uri
-osvolume_uri = image_streamer_client.os_volumes.get_all()[0]['uri']
-buildplan_uri = image_streamer_client.build_plans.get_all(filter='oeBuildPlanType=capture')[0]['uri']
-
-# You must set a valid osVolumeURI and buildPlanUri
-golden_image_information = {
-    "type": "GoldenImage",
-    "name": "Demo Golden Image Creation",
-    "description": "Test",
-    "imageCapture": "true",
-    "osVolumeURI": osvolume_uri,
-    "buildPlanUri": buildplan_uri
-}
-
-golden_image_upload = {
-    "name": "Demo Golden Image",
-    "description": "Test",
-}
-
-local_image_file_name = '~/image_file.zip'
-destination_file_path = '~/downloaded_image_file.zip'
-destination_archive_path = '~/archive_log.txt'
-
-# Create a Golden Image
-print("Create a Golden Image")
-golden_image_created = image_streamer_client.golden_images.create(golden_image_information)
-pprint(golden_image_created)
-print("***** done *****\n")
-
-# Upload a Golden Image
-print("Upload a Golden Image")
-golden_image_uploaded = image_streamer_client.golden_images.upload(local_image_file_name, golden_image_upload)
-pprint(golden_image_uploaded)
-print("***** done *****\n")
-
-# Get the Golden Image by URI
-print("Get the Golden Image by URI")
-golden_image = image_streamer_client.golden_images.get_by('name', golden_image_upload['name'])[0]
-pprint(golden_image)
-print("***** done *****\n")
-
-# Update the Golden Image
-print("Update the Golden Image")
-golden_image["description"] = "New description"
-golden_image = image_streamer_client.golden_images.update(golden_image)
-pprint(golden_image)
-print("***** done *****\n")
-
-# Get the Golden Image by URI
-print("Get the Golden Image by URI")
-golden_image = image_streamer_client.golden_images.get(golden_image['uri'])
-pprint(golden_image)
-print("***** done *****\n")
-
-# Download the Golden Image
-print("Get the Golden Image")
-if image_streamer_client.golden_images.download(golden_image['uri'], destination_file_path):
-    print("***** Golden Image successfully downloaded *****\n")
-else:
-    print("***** Golden Image download has failed *****\n")
-
-# Retrieve archived logs of the Golden Image
-print("Retrieve archived logs of the Golden Image")
-if image_streamer_client.golden_images.download_archive(golden_image_created['uri'], destination_archive_path):
-    print("***** Golden Image archive log successfully downloaded *****\n")
-else:
-    print("***** Golden Image archive log download has failed *****\n")
-print("***** done *****\n")
-
-# Get all Golden Images
-print("Get all Golden Images")
-golden_images = image_streamer_client.golden_images.get_all()
-for golden_image_item in golden_images:
-    print(golden_image_item['name'])
-print("***** done *****\n")
-
-# Delete the Golden Images
-print("Delete the Golden Images")
-image_streamer_client.golden_images.delete(golden_image)
-image_streamer_client.golden_images.delete(golden_image_created)
-print("Golden Images deleted successfully")
diff --git a/examples/image_streamer/os_volumes.py b/examples/image_streamer/os_volumes.py
deleted file mode 100644
index 9ec34bbcb..000000000
--- a/examples/image_streamer/os_volumes.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2021] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-import os
-from pprint import pprint
-from hpeOneView.oneview_client import OneViewClient
-
-EXAMPLE_CONFIG_FILE = os.path.join(os.path.dirname(__file__), '../config.json')
-
-oneview_client = OneViewClient.from_json_file(EXAMPLE_CONFIG_FILE)
-
-image_streamer_client = oneview_client.create_image_streamer_client()
-
-os_volumes_information = {
-    "name": "OSVolume-52",
-}
-destination_archive_path = './archive_log.txt'
-
-# Get all OS Volumes
-print("\nGet all OS Volumes")
-os_volumes = image_streamer_client.os_volumes.get_all()
-for os_volume in os_volumes:
-    pprint(os_volume)
-
-# Get the OS Volume id
-if os_volumes:
-    os_volumes_information['id'] = os_volumes[0]['uri'].split('/')[-1]
-
-# Get the OS Volume by ID
-print("\nGet the OS Volumes by ID")
-os_volume = image_streamer_client.os_volumes.get(os_volumes_information['id'])
-pprint(os_volume)
-
-# Get the OS Volume by Name
-print("\nGet the OS Volumes by Name")
-os_volume = image_streamer_client.os_volumes.get_by_name(os_volumes_information['name'])
-pprint(os_volume)
-
-# Get storage details (available only with API version 600 and above)
-print("Get storage details")
-storage = image_streamer_client.os_volumes.get_storage(os_volumes_information['id'])
-pprint(storage)
-
-# Retrieve archived logs of the OS Volume
-print("Retrieve archived logs of the OS Volume")
-if image_streamer_client.os_volumes.download_archive(os_volume['id'], destination_archive_path):
-    print("  File downloaded successfully.")
-else:
-    print("  Error downloading the file.")
diff --git a/examples/image_streamer/plan_scripts.py b/examples/image_streamer/plan_scripts.py
deleted file mode 100644
index 3a9945bab..000000000
--- a/examples/image_streamer/plan_scripts.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2019] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-import os
-from pprint import pprint
-from hpeOneView.oneview_client import OneViewClient
-
-EXAMPLE_CONFIG_FILE = os.path.join(os.path.dirname(__file__), '../config.json')
-
-oneview_client = OneViewClient.from_json_file(EXAMPLE_CONFIG_FILE)
-
-image_streamer_client = oneview_client.create_image_streamer_client()
-
-plan_script_information = {
-    "description": "Description of this plan script",
-    "name": "Demo Plan Script",
-    "hpProvided": False,
-    "planType": "deploy",
-    "content": 'echo "test script"'
-}
-
-# plan script which is used by buils plans and is readonly
-plan_script_id_readyonly = "590746df-7354-42aa-8887-e1ea122f7ed6"
-
-# Create a Plan Script
-print("Create a Plan Script")
-plan_script = image_streamer_client.plan_scripts.create(plan_script_information)
-pprint(plan_script)
-print("***** done *****\n")
-
-# Update the Plan Script
-print("Update the Plan Script")
-plan_script["description"] = "New description"
-plan_script["content"] = 'echo "Commands"\necho "Command 2"'
-plan_script = image_streamer_client.plan_scripts.update(plan_script)
-pprint(plan_script)
-print("***** done *****\n")
-
-# Get the Plan Script by URI
-print("Get the Plan Script by URI")
-plan_script = image_streamer_client.plan_scripts.get(plan_script['uri'])
-pprint(plan_script)
-print("***** done *****\n")
-
-# Retrieve the modified contents of the Plan Script
-print("Retrieves the modified contents of the Plan Script")
-differences = image_streamer_client.plan_scripts.retrieve_differences(plan_script['uri'], "Script content")
-pprint(differences)
-print("***** done *****\n")
-
-# Get all Plan Scripts
-print("Get all Plan Scripts")
-plan_scripts = image_streamer_client.plan_scripts.get_all()
-for plan_script_item in plan_scripts:
-    print(plan_script_item['name'])
-print("***** done *****\n")
-
-# Get used by and read only
-print("Gets builds plans which uses a particular read only plan script")
-build_plans = image_streamer_client.plan_scripts.get_usedby_and_readonly(plan_script_id_readyonly)
-for build_plan_item in build_plans:
-    print(build_plan_item["name"])
-print("**********done***********\n")
-
-# Delete the Plan Script
-print("Delete the Plan Script")
-image_streamer_client.plan_scripts.delete(plan_script)
-print("Plan Script deleted successfully")
diff --git a/examples/logical_interconnect_groups.py b/examples/logical_interconnect_groups.py
index d6f6b7c58..65f293bb7 100644
--- a/examples/logical_interconnect_groups.py
+++ b/examples/logical_interconnect_groups.py
@@ -39,7 +39,6 @@
 fc_networks = oneview_client.fc_networks
 
 # Define the scope name to add the logical interconnect group to it
-# iscsi_network = "iscsi_nw"  # iscsi network for image streamer uplinkset
 mgmt_untagged = "mgmt_nw"  # untagged managament network
 fc_fabric = "FC_fabric_nw"  # Fabric attach FC network
 scope_name = "test_scope"
diff --git a/examples/os_deployment_plans.py b/examples/os_deployment_plans.py
deleted file mode 100644
index 38216f7fb..000000000
--- a/examples/os_deployment_plans.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2019] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from pprint import pprint
-
-from config_loader import try_load_from_file
-from hpeOneView.oneview_client import OneViewClient
-
-config = {
-    "ip": "<oneview_ip>",
-    "credentials": {
-        "userName": "<user>",
-        "password": "<password>"
-    }
-}
-
-# Try load config from a file (if there is a config file)
-config = try_load_from_file(config)
-oneview_client = OneViewClient(config)
-os_deployment_plans = oneview_client.os_deployment_plans
-
-print("\nGet OS Deployment Plans by Filter:")
-plans = os_deployment_plans.get_by('deploymentType', 'I3S')
-pprint(plans)
-
-print("\nGet the OS Deployment Plan by Name:")
-os_deployment_plan = os_deployment_plans.get_by('name', 'Deployment Plan')
-pprint(os_deployment_plan)
-
-print("\nGet all OS Deployment Plans:")
-os_deployment_plans_all = os_deployment_plans.get_all()
-pprint(os_deployment_plans_all)
diff --git a/examples/os_deployment_servers.py b/examples/os_deployment_servers.py
deleted file mode 100644
index ddc51b745..000000000
--- a/examples/os_deployment_servers.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2019] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from pprint import pprint
-
-from config_loader import try_load_from_file
-from hpeOneView.oneview_client import OneViewClient
-
-config = {
-    "ip": "",
-    "credentials": {
-        "userName": "",
-        "password": ""
-    }
-}
-
-# Try load config from a file (if there is a config file)
-config = try_load_from_file(config)
-
-oneview_client = OneViewClient(config)
-
-# To run this example you must set valid URI of the network resource and of the image streamer appliance
-management_network_uri = ""
-appliance_uri = ""
-
-print("Add an Os Deployment Server:")
-resource = {
-    "description": "OS Deployment Server",
-    "name": "I3s-Deployment Server",
-    "mgmtNetworkUri": management_network_uri,
-    "applianceUri": appliance_uri,
-}
-os_deployment_server_added = oneview_client.os_deployment_servers.add(resource)
-pprint(os_deployment_server_added)
-
-print("Get all Os Deployment Servers:")
-os_deployment_servers_all = oneview_client.os_deployment_servers.get_all(start=0, count=-1, filter='state=Connected')
-pprint(os_deployment_servers_all)
-
-os_deployment_server_uri = os_deployment_server_added['uri']
-
-print("Get an Os Deployment Server by URI:")
-os_deployment_server = oneview_client.os_deployment_servers.get(os_deployment_server_uri)
-pprint(os_deployment_server)
-
-print("Get Os Deployment Servers by Filter:")
-os_deployment_servers = oneview_client.os_deployment_servers.get_by('state', 'Connected')
-pprint(os_deployment_servers)
-
-print("Get the Os Deployment Server by Name:")
-os_deployment_servers = oneview_client.os_deployment_servers.get_by_name("OS Deployment Server")
-pprint(os_deployment_servers)
-
-print("Get all Deployment Servers Networks:")
-networks = oneview_client.os_deployment_servers.get_networks()
-pprint(networks)
-
-print("List all the Image Streamer resources associated with deployment-server:")
-appliances = oneview_client.os_deployment_servers.get_appliances()
-pprint(appliances)
-
-print("List the particular Image Streamer resource with an given URI:")
-appliance = oneview_client.os_deployment_servers.get_appliance(appliances[0]['uri'], 'name')
-pprint(appliance)
-
-print("Update the Deployment Server description:")
-os_deployment_server_added['description'] = "Description Updated"
-os_deployment_server_updated = oneview_client.os_deployment_servers.update(os_deployment_server_added)
-pprint(os_deployment_server_updated)
-
-print("Delete the added Deployment Server:")
-oneview_client.os_deployment_servers.delete(os_deployment_server_updated)
-print("Done")
diff --git a/examples/server_profile_os_deployment.py b/examples/server_profile_os_deployment.py
deleted file mode 100644
index be07b3c04..000000000
--- a/examples/server_profile_os_deployment.py
+++ /dev/null
@@ -1,154 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2019] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-"""
-This module demonstrates a Server Profile creation with an associated i3s OS Deployment Plan.
-"""
-
-from pprint import pprint
-
-from config_loader import try_load_from_file
-from hpeOneView.oneview_client import OneViewClient
-
-config = {
-    "ip": "172.16.101.190",
-    "api_version": 300,
-    "credentials": {
-        "userName": "administrator",
-        "password": "",
-    }
-}
-
-# Try load config from a file (if there is a config file)
-config = try_load_from_file(config)
-
-oneview_client = OneViewClient(config)
-
-# To run this sample, you must define the values in the following dictionary:
-example_settings = {
-    "serverHardwareUri": "/rest/server-hardware/30303437-3034-4D32-3230-313131324752",
-    "serverHardwareTypeUri": "/rest/server-hardware-types/1D1DB02A-2A57-4934-862B-B74E7832EBC2",
-    "enclosureGroupUri": "/rest/enclosure-groups/184736fb-c64b-420f-b73f-ed62a9d9ea43",
-    "networkUri": "/rest/ethernet-networks/062ff757-6ddd-47b4-b5c9-634498b85823",
-    "osDeploymentPlanUri": "/rest/os-deployment-plans/81decf85-0dff-4a5e-8a95-52994eeb6493",
-    "osDeploymentHostname": "examplehostname",
-}
-
-server_profile_creation_info = {
-    "type": "ServerProfileV6",
-    "serverHardwareUri": example_settings["serverHardwareUri"],
-    "serverHardwareTypeUri": example_settings["serverHardwareTypeUri"],
-    "enclosureGroupUri": example_settings["enclosureGroupUri"],
-    "serialNumberType": "Virtual",
-    "iscsiInitiatorNameType": "AutoGenerated",
-    "macType": "Virtual",
-    "wwnType": "Virtual",
-    "name": "sp2",
-    "description": "i3s deployment plan (for example)",
-    "affinity": "Bay",
-    "connections": [
-        {
-            "id": 1,
-            "name": "Deployment Network A",
-            "functionType": "Ethernet",
-            "portId": "Mezz 3:1-a",
-            "requestedMbps": "2500",
-            "networkUri": example_settings["networkUri"],
-            "boot": {
-                "priority": "Primary",
-                "initiatorNameSource": "ProfileInitiatorName",
-                "firstBootTargetIp": None,
-                "secondBootTargetIp": "",
-                "secondBootTargetPort": "",
-                "initiatorName": None,
-                "initiatorIp": None,
-                "bootTargetName": None,
-                "bootTargetLun": None
-            },
-            "mac": None,
-            "wwpn": "",
-            "wwnn": "",
-            "requestedVFs": "Auto"
-        },
-        {
-            "id": 2,
-            "name": "Deployment Network B",
-            "functionType": "Ethernet",
-            "portId": "Mezz 3:2-a",
-            "requestedMbps": "2500",
-            "networkUri": example_settings["networkUri"],
-            "boot": {
-                "priority": "Secondary",
-                "initiatorNameSource": "ProfileInitiatorName",
-                "firstBootTargetIp": None,
-                "secondBootTargetIp": "",
-                "secondBootTargetPort": "",
-                "initiatorName": None,
-                "initiatorIp": None,
-                "bootTargetName": None,
-                "bootTargetLun": None
-            },
-            "mac": None,
-            "wwpn": "",
-            "wwnn": "",
-            "requestedVFs": "Auto"
-        }
-    ],
-    "boot": {
-        "manageBoot": True,
-        "order": [
-            "HardDisk"
-        ]
-    },
-    "bootMode": {
-        "manageMode": True,
-        "mode": "UEFIOptimized",
-        "pxeBootPolicy": "Auto"
-    },
-    "firmware": {
-        "manageFirmware": False,
-        "firmwareBaselineUri": "",
-        "forceInstallFirmware": False,
-        "firmwareInstallType": None
-    },
-    "bios": {
-        "manageBios": False,
-        "overriddenSettings": []
-    },
-    "hideUnusedFlexNics": True,
-    "iscsiInitiatorName": "",
-    "osDeploymentSettings": {
-        "osDeploymentPlanUri": example_settings["osDeploymentPlanUri"],
-        "osCustomAttributes": [
-            {
-                "name": "hostname",
-                "value": example_settings["osDeploymentHostname"]
-            }
-        ],
-        "osVolumeUri": None
-    },
-    "localStorage": {
-        "sasLogicalJBODs": [],
-        "controllers": []
-    },
-    "sanStorage": None
-}
-
-# Create a server profile
-print("Create a Server Profile with associated OS Deployment")
-basic_profile = oneview_client.server_profiles.create(server_profile_creation_info)
-pprint(basic_profile)
diff --git a/hpeOneView/image_streamer/__init__.py b/hpeOneView/image_streamer/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/hpeOneView/image_streamer/image_streamer_client.py b/hpeOneView/image_streamer/image_streamer_client.py
deleted file mode 100644
index 576019bac..000000000
--- a/hpeOneView/image_streamer/image_streamer_client.py
+++ /dev/null
@@ -1,140 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2020] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-"""
-This module implements a common client for HPE Image Streamer REST API.
-"""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-from future import standard_library
-
-standard_library.install_aliases()
-
-
-from hpeOneView.connection import connection
-from hpeOneView.image_streamer.resources.golden_images import GoldenImages
-from hpeOneView.image_streamer.resources.plan_scripts import PlanScripts
-from hpeOneView.image_streamer.resources.build_plans import BuildPlans
-from hpeOneView.image_streamer.resources.os_volumes import OsVolumes
-from hpeOneView.image_streamer.resources.deployment_plans import DeploymentPlans
-from hpeOneView.image_streamer.resources.artifact_bundles import ArtifactBundles
-from hpeOneView.image_streamer.resources.deployment_groups import DeploymentGroups
-
-
-class ImageStreamerClient(object):
-    def __init__(self, ip, session_id, api_version, sslBundle=False):
-        self.__connection = connection(ip, api_version, sslBundle)
-        self.__connection.set_session_id(session_id)
-        self.__golden_images = None
-        self.__plan_scripts = None
-        self.__build_plans = None
-        self.__os_volumes = None
-        self.__deployment_plans = None
-        self.__artifact_bundles = None
-        self.__deployment_groups = None
-
-    @property
-    def connection(self):
-        """
-        Gets the underlying HPE Image Streamer connection used by the ImageStreamerClient.
-
-        Returns:
-            connection:
-        """
-        return self.__connection
-
-    @property
-    def golden_images(self):
-        """
-        Gets the Golden Images API client.
-
-        Returns:
-            GoldenImages:
-        """
-        if not self.__golden_images:
-            self.__golden_images = GoldenImages(self.__connection)
-        return self.__golden_images
-
-    @property
-    def plan_scripts(self):
-        """
-        Gets the Plan Scripts API client.
-
-        Returns:
-            PlanScripts:
-        """
-        if not self.__plan_scripts:
-            self.__plan_scripts = PlanScripts(self.__connection)
-        return self.__plan_scripts
-
-    @property
-    def build_plans(self):
-        """
-        Gets the Build Plans API client.
-
-        Returns:
-            BuildPlans:
-        """
-        if not self.__build_plans:
-            self.__build_plans = BuildPlans(self.__connection)
-        return self.__build_plans
-
-    @property
-    def os_volumes(self):
-        """
-        Gets the OS Volumes API client.
-
-        Returns:
-            OsVolumes:
-        """
-        if not self.__os_volumes:
-            self.__os_volumes = OsVolumes(self.__connection)
-        return self.__os_volumes
-
-    @property
-    def deployment_plans(self):
-        """
-        Gets the Deployment Plans API client.
-
-        Returns:
-            DeploymentPlans:
-        """
-        return DeploymentPlans(self.__connection)
-
-    @property
-    def artifact_bundles(self):
-        """
-        Gets the Artifact Bundles API client.
-
-        Returns:
-            ArtifactBundles:
-        """
-        return ArtifactBundles(self.__connection)
-
-    @property
-    def deployment_groups(self):
-        """
-        Gets the Deployment Groups API client.
-
-        Returns:
-            DeploymentGroups:
-        """
-        if not self.__deployment_groups:
-            self.__deployment_groups = DeploymentGroups(self.__connection)
-        return self.__deployment_groups
diff --git a/hpeOneView/image_streamer/resources/__init__.py b/hpeOneView/image_streamer/resources/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/hpeOneView/image_streamer/resources/artifact_bundles.py b/hpeOneView/image_streamer/resources/artifact_bundles.py
deleted file mode 100644
index 204e26c10..000000000
--- a/hpeOneView/image_streamer/resources/artifact_bundles.py
+++ /dev/null
@@ -1,200 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2020] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future import standard_library
-
-standard_library.install_aliases()
-
-
-from hpeOneView.resources.resource import Resource, ResourceFileHandlerMixin, extract_id_from_uri
-
-
-class ArtifactBundles(ResourceFileHandlerMixin, Resource):
-
-    URI = '/rest/artifact-bundles'
-    BACKUPS_PATH = '/rest/artifact-bundles/backups'
-    BACKUP_ARCHIVE_PATH = '/rest/artifact-bundles/backups/archive'
-    DOWNLOAD_PATH = '/rest/artifact-bundles/download'
-
-    def __init__(self, connection, data=None):
-        super(ArtifactBundles, self).__init__(connection, data)
-        self.__default_values = {
-            'type': 'ArtifactsBundle'
-        }
-
-    def get_all_backups(self):
-        """
-        Get all Backups for Artifact Bundle.
-
-        Returns:
-            list: A list of Backups for Artifacts Bundle.
-        """
-        return self._helper.get_collection(uri=self.BACKUPS_PATH)
-
-    def get_backup(self, uri):
-        """
-        Get the details for the backup from an Artifact Bundle.
-
-        Args:
-            uri: URI of the Artifact Bundle.
-
-        Returns:
-            Dict: Backup for an Artifacts Bundle.
-        """
-        uri = self.BACKUPS_PATH + '/' + extract_id_from_uri(uri)
-        return super(ArtifactBundles, self).get_by_uri(uri)
-
-    def download_archive(self, path, uri=None):
-        """
-        Downloads backup archive for the Artifact Bundle.
-
-        Args:
-            path(str): Destination file path.
-            uri: URI of the Artifact Bundle.
-
-        Returns:
-            bool: Successfully downloaded.
-        """
-        if not uri:
-            uri = self.data['uri']
-
-        download_uri = self.BACKUP_ARCHIVE_PATH + '/' + extract_id_from_uri(uri)
-        return super(ArtifactBundles, self).download(download_uri, path)
-
-    def download(self, path, uri=None):
-        """
-        Download the Artifact Bundle.
-
-        Args:
-            uri: URI of the Artifact Bundle.
-            path(str): Destination file path.
-
-        Returns:
-            bool: Successfully downloaded.
-        """
-        if not uri:
-            uri = self.data['uri']
-
-        download_uri = self.DOWNLOAD_PATH + '/' + extract_id_from_uri(uri)
-        return super(ArtifactBundles, self).download(download_uri, path)
-
-    def create_backup(self, resource, timeout=-1):
-        """
-        Creates a backup bundle with all the artifacts present on the appliance. At any given point only one backup
-        bundle will exist on the appliance.
-
-        Args:
-            resource (dict): Deployment Group to create the backup.
-            timeout:
-                Timeout in seconds. Waits for task completion by default. The timeout does not abort the operation in
-                OneView, it just stops waiting for its completion.
-
-        Returns:
-            dict: A Deployment Group associated with the Artifact Bundle backup.
-        """
-        return super(ArtifactBundles, self).create(resource, uri=self.BACKUPS_PATH, timeout=timeout)
-
-    def upload_bundle_from_file(self, file_path):
-        """
-        Restore an Artifact Bundle from a backup file.
-
-        Args:
-            file_path (str): The File Path to restore the Artifact Bundle.
-
-        Returns:
-            dict: Artifact bundle.
-        """
-        return super(ArtifactBundles, self).upload(file_path)
-
-    def upload_backup_bundle_from_file(self, file_path, deployment_group_uri):
-        """
-        Restore an Artifact Bundle from a backup file.
-
-        Args:
-            file_path (str): The File Path to restore the Artifact Bundle.
-            deployment_group_uri: URI of the Deployment Groups.
-
-        Returns:
-            dict: Deployment group.
-        """
-        uri = self.BACKUP_ARCHIVE_PATH + "?deploymentGrpUri=" + deployment_group_uri
-        return super(ArtifactBundles, self).upload(file_path, uri)
-
-    def extract(self, resource=None, uri=None, timeout=-1):
-        """
-        Extracts the existing bundle on the appliance and creates all the artifacts.
-
-        Args:
-            resource (dict): Artifact Bundle to extract.
-            uri: URI of artifact bundle
-            timeout:
-                Timeout in seconds. Waits for task completion by default. The timeout does not abort the operation in
-                OneView, it just stops waiting for its completion.
-
-        Returns:
-            dict: The Artifact Bundle.
-        """
-        if not uri:
-            uri = self.data['uri']
-
-        extract_uri = "{}?extract=true&forceImport=true".format(uri)
-        return self._helper.update(resource, extract_uri, timeout=timeout, custom_headers={"Content-Type": "text/plain;charset=UTF-8"})
-
-    def extract_backup(self, resource, uri=None, timeout=-1):
-        """
-        Extracts the existing backup bundle on the appliance and creates all the artifacts.
-
-        Args:
-            resource (dict): Deployment Group to extract.
-            uri: URI of artifact backup
-            timeout:
-                Timeout in seconds. Waits for task completion by default. The timeout does not abort the operation in
-                OneView, it just stops waiting for its completion.
-
-        Returns:
-            dict: A Deployment Group associated with the Artifact Bundle backup.
-        """
-        if not uri:
-            uri = self.data['uri']
-
-        extract_uri = self.BACKUPS_PATH + '/' + extract_id_from_uri(uri)
-        return self._helper.update(resource, extract_uri, timeout=timeout)
-
-    def stop_artifact_creation(self, task_uri, uri=None):
-        """
-        Stops creation of the selected Artifact Bundle.
-
-        Args:
-            task_uri: Task URI associated with the Artifact Bundle.
-            uri: URI of the Artifact Bundle.
-
-        Returns:
-            string:
-        """
-        if not uri:
-            uri = self.data['uri']
-
-        data = {
-            "taskUri": task_uri
-        }
-
-        stop_uri = "{}/stopArtifactCreate".format(uri)
-        return self._helper.update(data, uri=stop_uri)
diff --git a/hpeOneView/image_streamer/resources/build_plans.py b/hpeOneView/image_streamer/resources/build_plans.py
deleted file mode 100644
index 833e05b40..000000000
--- a/hpeOneView/image_streamer/resources/build_plans.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2019] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future import standard_library
-
-standard_library.install_aliases()
-
-
-from hpeOneView.resources.resource import ResourceClient
-
-
-class BuildPlans(object):
-    URI = '/rest/build-plans'
-
-    DEFAULT_VALUES = {
-        '300': {'type': 'OeBuildPlan'},
-        '500': {'type': 'OeBuildPlanV5'},
-        '600': {'type': 'OeBuildPlanV5'}
-    }
-
-    def __init__(self, con):
-        self._connection = con
-        self._client = ResourceClient(con, self.URI)
-
-    def get_all(self, start=0, count=-1, filter='', sort=''):
-        """
-        Gets a list of OS Build Plan resources based on optional sorting and filtering, and constrained by start and
-        count parameters.
-
-        Args:
-            start:
-                The first item to return, using 0-based indexing.
-                If not specified, the default is 0 - start with the first available item.
-            count:
-                The number of resources to return. A count of -1 requests all items.
-                The actual number of items in the response might differ from the requested
-                count if the sum of start and count exceeds the total number of items.
-            filter (list or str):
-                A general filter/query string to narrow the list of items returned. The
-                default is no filter; all resources are returned.
-            sort:
-                The sort order of the returned data set. By default, the sort order is based
-                on create time with the oldest entry first.
-
-        Returns:
-            list: A list of OS Build Plan.
-        """
-        return self._client.get_all(start, count, filter=filter, sort=sort)
-
-    def get_by(self, field, value):
-        """
-        Gets all OS Build Plans that match the filter.
-
-        The search is case-insensitive.
-
-        Args:
-            field: Field name to filter.
-            value: Value to filter.
-
-        Returns:
-            list: A list of OS Build Plans.
-        """
-        return self._client.get_by(field, value)
-
-    def get(self, id_or_uri):
-        """
-        Retrieves a specific OS Build Plan resource based on the ID or URI provided.
-
-        Args:
-            id_or_uri: ID or URI of the Build Plan.
-
-        Returns:
-            dict: The OS Build Plan.
-        """
-        return self._client.get(id_or_uri)
-
-    def create(self, resource, timeout=-1):
-        """
-        Creates an OS Build Plan using the information provided. The OS Build Plan can be one of the following types -
-        Deploy or Capture.
-
-        Args:
-            resource (dict): Object to create.
-            timeout:
-                Timeout in seconds. Waits for task completion by default. The timeout does not abort the operation
-                in OneView, it just stops waiting for its completion.
-
-        Returns:
-            dict: Created OS Build Plan.
-
-        """
-        return self._client.create(resource, timeout=timeout, default_values=self.DEFAULT_VALUES)
-
-    def update(self, resource, timeout=-1):
-        """
-        Updates the properties of the OS Build Plan.
-
-        Args:
-            resource (dict): Object to update.
-            timeout:
-                Timeout in seconds. Waits for task completion by default. The timeout does not abort the operation
-                in OneView, it just stops waiting for its completion.
-
-        Returns:
-            dict: Updated OS Build Plan.
-
-        """
-        return self._client.update(resource, timeout=timeout)
-
-    def delete(self, resource, force=False, timeout=-1):
-        """
-        Deletes an OS Build Plan resource.
-
-        Args:
-            resource: dict object to delete
-            force:
-                 If set to true, the operation completes despite any problems with
-                 network connectivity or errors on the resource itself. The default is false.
-            timeout:
-                Timeout in seconds. Waits for task completion by default. The timeout does not abort the operation
-                in OneView; it just stops waiting for its completion.
-
-        Returns:
-            bool: Indicates if the resource was successfully deleted.
-
-        """
-        return self._client.delete(resource, force=force, timeout=timeout)
diff --git a/hpeOneView/image_streamer/resources/deployment_groups.py b/hpeOneView/image_streamer/resources/deployment_groups.py
deleted file mode 100644
index 65dbcce23..000000000
--- a/hpeOneView/image_streamer/resources/deployment_groups.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2019] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future import standard_library
-
-standard_library.install_aliases()
-
-from hpeOneView.resources.resource import ResourceClient
-
-
-class DeploymentGroups(object):
-
-    URI = '/rest/deployment-groups'
-
-    def __init__(self, con):
-        self._client = ResourceClient(con, self.URI)
-
-    def get_all(self, start=0, count=-1, filter='', sort=''):
-        """
-        Gets a list of the Deployment Group based on optional sorting and filtering, and constrained by start and count
-        parameters.
-
-        Args:
-            start:
-                The first item to return, using 0-based indexing.
-                If not specified, the default is 0 - start with the first available item.
-            count:
-                The number of resources to return. A count of -1 requests all items.
-
-                The actual number of items in the response might differ from the requested
-                count if the sum of start and count exceeds the total number of items.
-            filter (list or str):
-                A general filter/query string to narrow the list of items returned. The
-                default is no filter; all resources are returned.
-            sort:
-                The sort order of the returned data set. By default, the sort order is based
-                on create time with the oldest entry first.
-
-        Returns:
-            list: A list of Deployment Group.
-        """
-        return self._client.get_all(start, count, filter=filter, sort=sort)
-
-    def get(self, id_or_uri):
-        """
-        Retrieves the overview details of the selected Deployment Group as per the selected attributes.
-
-        Args:
-            id_or_uri: ID or URI of the Deployment Group.
-
-        Returns:
-            dict: The Deployment Group.
-        """
-        return self._client.get(id_or_uri)
-
-    def get_by(self, field, value):
-        """
-        Gets all Deployment Groups that match the filter.
-
-        The search is case-insensitive.
-
-        Args:
-            field: Field name to filter.
-            value: Value to filter.
-
-        Returns:
-            list: A list of Deployment Group.
-        """
-        return self._client.get_by(field, value)
-
-    def get_by_name(self, name):
-        """
-        Gets a Deployment Group by name.
-
-        Args:
-            name: Name of the Deployment Group.
-
-        Returns:
-            dict: The Deployment Group.
-        """
-        return self._client.get_by_name(name)
diff --git a/hpeOneView/image_streamer/resources/deployment_plans.py b/hpeOneView/image_streamer/resources/deployment_plans.py
deleted file mode 100644
index c2cbd0d07..000000000
--- a/hpeOneView/image_streamer/resources/deployment_plans.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2020] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future import standard_library
-
-standard_library.install_aliases()
-
-
-from hpeOneView.resources.resource import Resource
-
-
-class DeploymentPlans(Resource):
-    URI = '/rest/deployment-plans'
-
-    def __init__(self, connection, data=None):
-        super(DeploymentPlans, self).__init__(connection, data)
-        self.__default_values = {
-            'type': 'OEDeploymentPlan',
-        }
-
-    def create(self, resource, timeout=-1):
-        """
-        Adds a Deployment Plan based on the attributes specified.
-
-        Args:
-            resource (dict): Object to create.
-            timeout:
-                Timeout in seconds. Waits for task completion by default. The timeout does not abort the operation
-                in OneView, it just stops waiting for its completion.
-
-        Returns:
-            dict: Created Deployment plan.
-
-        """
-        data = self.__default_values.copy()
-        data.update(resource)
-
-        return super(DeploymentPlans, self).create(data, timeout=timeout)
-
-    def get_osdp(self, uri_or_id=None):
-        """
-        Retrieves facts about Server Profiles and Server Profile Templates that are using Deployment Plan based on the ID or URI provided.
-
-        Returns:
-            dict: Server Profiles and Server Profile Templates
-        """
-        if uri_or_id is None:
-            uri_or_id = "{}/osdp".format(self.data["uri"])
-        return self._helper.do_get(uri_or_id)
-
-    def get_usedby(self, uri_or_id=None):
-        """
-        Retrieves the OS deployment plan details from OneView for a deployment plan resource based on the ID or URI provided.
-
-        Returns:
-            dict: The OS Deployment Plan.
-        """
-        if uri_or_id is None:
-            uri_or_id = "{}/usedby".format(self.data["uri"])
-        return self._helper.do_get(uri_or_id)
diff --git a/hpeOneView/image_streamer/resources/golden_images.py b/hpeOneView/image_streamer/resources/golden_images.py
deleted file mode 100644
index 2714e9543..000000000
--- a/hpeOneView/image_streamer/resources/golden_images.py
+++ /dev/null
@@ -1,191 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2019] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future import standard_library
-
-standard_library.install_aliases()
-
-
-from hpeOneView.resources.resource import ResourceClient, extract_id_from_uri
-from hpeOneView.resources.task_monitor import TaskMonitor
-from urllib.parse import quote
-
-
-class GoldenImages(object):
-    URI = '/rest/golden-images'
-
-    def __init__(self, con):
-        self._client = ResourceClient(con, self.URI)
-        self._task_monitor = TaskMonitor(con)
-        self.__default_values = {
-            'type': 'GoldenImage',
-        }
-
-    def get_all(self, start=0, count=-1, filter='', sort=''):
-        """
-        Retrieves a list of Golden Image resources as per the specified parameters.
-
-        Args:
-            start:
-                The first item to return, using 0-based indexing.
-                If not specified, the default is 0 - start with the first available item.
-            count:
-                The number of resources to return. A count of -1 requests all items.
-
-                The actual number of items in the response might differ from the requested
-                count if the sum of start and count exceeds the total number of items.
-            filter (list or str):
-                A general filter/query string to narrow the list of items returned. The
-                default is no filter; all resources are returned.
-            sort:
-                The sort order of the returned data set. By default, the sort order is based
-                on create time with the oldest entry first.
-
-        Returns:
-            list: A list of Golden Images.
-        """
-        return self._client.get_all(start, count, filter=filter, sort=sort)
-
-    def create(self, resource, timeout=-1):
-        """
-        Creates a Golden Image resource from the deployed OS Volume as per the attributes specified.
-
-        Args:
-            resource (dict): Object to create.
-            timeout:
-                Timeout in seconds. Waits for task completion by default. The timeout does not abort the operation
-                in OneView, it just stops waiting for its completion.
-
-        Returns:
-            dict: Golden Image created.
-        """
-        data = self.__default_values.copy()
-        data.update(resource)
-        return self._client.create(data, timeout=timeout)
-
-    def upload(self, file_path, golden_image_info):
-        """
-        Adds a Golden Image resource from the file that is uploaded from a local drive. Only the .zip format file can
-        be used for the upload.
-
-        Args:
-            file_path (str): File name to upload.
-            golden_image_info (dict): Golden Image information.
-
-        Returns:
-            dict: Golden Image.
-        """
-        uri = "{0}?name={1}&description={2}".format(self.URI,
-                                                    quote(golden_image_info.get('name', '')),
-                                                    quote(golden_image_info.get('description', '')))
-
-        return self._client.upload(file_path, uri)
-
-    def download_archive(self, id_or_uri, file_path):
-        """
-        Download the details of the Golden Image capture logs, which has been archived based on the specific attribute
-        ID.
-
-        Args:
-            id_or_uri: ID or URI of the Golden Image.
-            file_path (str): File name to save the archive.
-
-        Returns:
-            bool: Success.
-        """
-        uri = self.URI + "/archive/" + extract_id_from_uri(id_or_uri)
-        return self._client.download(uri, file_path)
-
-    def download(self, id_or_uri, file_path):
-        """
-        Downloads the content of the selected Golden Image as per the specified attributes.
-
-        Args:
-            id_or_uri: ID or URI of the Golden Image.
-            file_path(str): Destination file path.
-
-        Returns:
-            bool: Successfully downloaded.
-        """
-        uri = self.URI + "/download/" + extract_id_from_uri(id_or_uri)
-        return self._client.download(uri, file_path)
-
-    def get(self, id_or_uri):
-        """
-        Retrieves the overview details of the selected Golden Image as per the specified attributes.
-
-        Args:
-            id_or_uri: ID or URI of the Golden Image.
-
-        Returns:
-            dict: The Golden Image.
-        """
-        return self._client.get(id_or_uri)
-
-    def update(self, resource, timeout=-1):
-        """
-        Updates the properties of the Golden Image.
-
-        Args:
-            resource (dict): Object to update.
-            timeout:
-                Timeout in seconds. Waits for task completion by default. The timeout does not abort the operation
-                in OneView, it just stops waiting for its completion.
-
-        Returns:
-            dict: Updated resource.
-
-        """
-        return self._client.update(resource, timeout=timeout)
-
-    def delete(self, resource, force=False, timeout=-1):
-        """
-        Deletes the Golden Image specified.
-
-        Args:
-            resource: dict object to delete
-            force:
-                 If set to true, the operation completes despite any problems with
-                 network connectivity or errors on the resource itself. The default is false.
-            timeout:
-                Timeout in seconds. Waits for task completion by default. The timeout does not abort the operation
-                in OneView; it just stops waiting for its completion.
-
-        Returns:
-            bool: Indicates if the resource was successfully deleted.
-
-        """
-        return self._client.delete(resource, force=force, timeout=timeout)
-
-    def get_by(self, field, value):
-        """
-        Gets all Golden Images that match the filter.
-
-        The search is case-insensitive.
-
-        Args:
-            field: Field name to filter.
-            value: Value to filter.
-
-        Returns:
-            list: A list of Golden Images.
-        """
-        return self._client.get_by(field, value)
diff --git a/hpeOneView/image_streamer/resources/os_volumes.py b/hpeOneView/image_streamer/resources/os_volumes.py
deleted file mode 100644
index c8a90a940..000000000
--- a/hpeOneView/image_streamer/resources/os_volumes.py
+++ /dev/null
@@ -1,129 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2019] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future import standard_library
-
-standard_library.install_aliases()
-
-
-from hpeOneView.resources.resource import ResourceClient, extract_id_from_uri
-
-
-class OsVolumes(object):
-    URI = '/rest/os-volumes'
-
-    def __init__(self, con):
-        self._client = ResourceClient(con, self.URI)
-        self.__default_values = {
-            'type': 'OeVolume',
-        }
-
-    def get_all(self, start=0, count=-1, filter='', sort=''):
-        """
-        Gets a list of the OS Volume based on optional sorting and filtering, and constrained by start and count
-        parameters.
-
-        Args:
-            start:
-                The first item to return, using 0-based indexing.
-                If not specified, the default is 0 - start with the first available item.
-            count:
-                The number of resources to return. A count of -1 requests all items.
-
-                The actual number of items in the response might differ from the requested
-                count if the sum of start and count exceeds the total number of items.
-            filter (list or str):
-                A general filter/query string to narrow the list of items returned. The
-                default is no filter; all resources are returned.
-            sort:
-                The sort order of the returned data set. By default, the sort order is based
-                on create time with the oldest entry first.
-
-        Returns:
-            list: A list of OS Volume.
-        """
-        return self._client.get_all(start, count, filter=filter, sort=sort)
-
-    def get(self, id_or_uri):
-        """
-        Retrieves the overview details of the selected OS Volume as per the selected attributes.
-
-        Args:
-            id_or_uri: ID or URI of the OS Volume.
-
-        Returns:
-            dict: The OS Volume.
-        """
-        return self._client.get(id_or_uri)
-
-    def get_by(self, field, value):
-        """
-        Gets all OS Volume that match the filter.
-
-        The search is case-insensitive.
-
-        Args:
-            field: Field name to filter.
-            value: Value to filter.
-
-        Returns:
-            list: A list of OS Volume.
-        """
-        return self._client.get_by(field, value)
-
-    def get_by_name(self, name):
-        """
-        Gets an OS Volume by name.
-
-        Args:
-            name: Name of the OS Volume.
-
-        Returns:
-            dict: The OS Volume.
-        """
-        return self._client.get_by_name(name)
-
-    def download_archive(self, name, file_path):
-        """
-        Download archived logs of the OS Volume.
-
-        Args:
-            name: Name of the OS Volume.
-            file_path (str): Destination file path.
-
-        Returns:
-            bool: Indicates if the resource was successfully downloaded.
-        """
-        uri = self.URI + "/archive/" + name
-        return self._client.download(uri, file_path)
-
-    def get_storage(self, id_or_uri):
-        """
-        Get storage details of an OS Volume.
-
-        Args:
-            id_or_uri: ID or URI of the OS Volume.
-
-        Returns:
-            dict: Storage details
-        """
-        uri = self.URI + "/{}/storage".format(extract_id_from_uri(id_or_uri))
-        return self._client.get(uri)
diff --git a/hpeOneView/image_streamer/resources/plan_scripts.py b/hpeOneView/image_streamer/resources/plan_scripts.py
deleted file mode 100644
index f9edaaf50..000000000
--- a/hpeOneView/image_streamer/resources/plan_scripts.py
+++ /dev/null
@@ -1,177 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2019] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future import standard_library
-
-standard_library.install_aliases()
-
-
-from hpeOneView.resources.resource import ResourceClient, extract_id_from_uri
-
-
-class PlanScripts(object):
-    URI = '/rest/plan-scripts'
-
-    def __init__(self, con):
-        self._connection = con
-        self._client = ResourceClient(con, self.URI)
-        self.__default_values = {
-            'type': 'PlanScript',
-        }
-
-    def get_all(self, start=0, count=-1, filter='', sort=''):
-        """
-        Gets a list of Plan Scripts based on optional sorting and filtering, and constrained by start and count
-        parameters.
-
-        Args:
-            start:
-                The first item to return, using 0-based indexing.
-                If not specified, the default is 0 - start with the first available item.
-            count:
-                The number of resources to return. A count of -1 requests all items.
-
-                The actual number of items in the response might differ from the requested
-                count if the sum of start and count exceeds the total number of items.
-            filter (list or str):
-                A general filter/query string to narrow the list of items returned. The
-                default is no filter; all resources are returned.
-            sort:
-                The sort order of the returned data set. By default, the sort order is based
-                on create time with the oldest entry first.
-
-        Returns:
-            list: A list of Plan Scripts.
-        """
-        return self._client.get_all(start, count, filter=filter, sort=sort)
-
-    def delete(self, resource, force=False, timeout=-1):
-        """
-        Deletes a Plan Script object from the appliance based on its Plan Script UUID.
-
-        Args:
-            resource: dict object to delete
-            force:
-                 If set to true, the operation completes despite any problems with
-                 network connectivity or errors on the resource itself. The default is false.
-            timeout:
-                Timeout in seconds. Waits for task completion by default. The timeout does not abort the operation
-                in OneView; it just stops waiting for its completion.
-
-        Returns:
-            bool: Indicates if the resource was successfully deleted.
-
-        """
-        return self._client.delete(resource, force=force, timeout=timeout)
-
-    def get(self, id_or_uri):
-        """
-        Retrieves the overview details of the selected Plan Script as per the selected attributes.
-
-        Args:
-            id_or_uri: ID or URI of the Plan Script.
-
-        Returns:
-            dict: The Plan Script.
-        """
-        return self._client.get(id_or_uri)
-
-    def create(self, resource, timeout=-1):
-        """
-        Adds a Plan Script using the information provided in the request body. The plan type can be one of the
-        following types: General, deploy and capture. Note: The OS type for the Plan Script is always assigned
-        as "ESXi".
-
-        Args:
-            resource (dict): Object to create.
-            timeout:
-                Timeout in seconds. Waits for task completion by default. The timeout does not abort the operation
-                in OneView, it just stops waiting for its completion.
-
-        Returns:
-            dict: Created Plan Script.
-
-        """
-        data = self.__default_values.copy()
-        data.update(resource)
-        return self._client.create(data, timeout=timeout)
-
-    def update(self, resource, timeout=-1):
-        """
-        Updates the properties of the Plan Script.
-
-        Args:
-            resource (dict): Object to update.
-            timeout:
-                Timeout in seconds. Waits for task completion by default. The timeout does not abort the operation
-                in OneView, it just stops waiting for its completion.
-
-        Returns:
-            dict: Updated resource.
-
-        """
-        return self._client.update(resource, timeout=timeout)
-
-    def get_by(self, field, value):
-        """
-        Gets all Plan Scripts that match the filter.
-
-        The search is case-insensitive.
-
-        Args:
-            field: Field name to filter.
-            value: Value to filter.
-
-        Returns:
-            list: A list of Plan Scripts.
-        """
-        return self._client.get_by(field, value)
-
-    def retrieve_differences(self, id_or_uri, content, timeout=-1):
-        """
-        Retrieves the modified contents of the selected Plan Script according to the provided content object, as per
-        the selected attributes.
-
-        Args:
-            id_or_uri: ID or URI of the Plan Script.
-            content (str): Plan Script content.
-            timeout:
-                Timeout in seconds. Waits for task completion by default. The timeout does not abort the operation
-                in OneView, it just stops waiting for its completion.
-
-        Returns:
-            dict: Script differences.
-        """
-        uri = self.URI + "/differences/" + extract_id_from_uri(id_or_uri)
-        return self._client.create(content, uri=uri, timeout=timeout)
-
-    def get_usedby_and_readonly(self, id):
-        """
-        Gets the build plans details os teh selected plan script as per the selected attributes.
-
-        Args:
-            id: ID of the Plan Script.
-
-        Returns:
-            array of build plans
-        """
-        uri = self.URI + "/" + id + "/usedby/readonly"
-        return self._client.get(uri)
diff --git a/hpeOneView/oneview_client.py b/hpeOneView/oneview_client.py
index 33d6cb581..a9667d272 100755
--- a/hpeOneView/oneview_client.py
+++ b/hpeOneView/oneview_client.py
@@ -31,7 +31,6 @@
 import os
 
 from hpeOneView.connection import connection
-from hpeOneView.image_streamer.image_streamer_client import ImageStreamerClient
 from hpeOneView.resources.security.certificate_authority import CertificateAuthority
 from hpeOneView.resources.servers.connections import Connections
 from hpeOneView.resources.networking.fc_networks import FcNetworks
@@ -98,8 +97,6 @@
 from hpeOneView.resources.search.labels import Labels
 from hpeOneView.resources.activity.alerts import Alerts
 from hpeOneView.resources.activity.events import Events
-from hpeOneView.resources.uncategorized.os_deployment_plans import OsDeploymentPlans
-from hpeOneView.resources.uncategorized.os_deployment_servers import OsDeploymentServers
 from hpeOneView.resources.security.certificate_rabbitmq import CertificateRabbitMQ
 from hpeOneView.resources.security.login_details import LoginDetails
 from hpeOneView.resources.security.roles import Roles
@@ -122,7 +119,6 @@
 from hpeOneView.resources.settings.appliance_ssh_access import ApplianceSshAccess
 
 ONEVIEW_CLIENT_INVALID_PROXY = 'Invalid Proxy format'
-ONEVIEW_CLIENT_INVALID_I3S_IP = 'Image streamer ip address is missing'
 ONEVIEW_CLIENT_MISSING_IP = 'Oneview ip address is missing'
 
 
@@ -131,7 +127,6 @@ class OneViewClient(object):
     def __init__(self, config, sessionID=None):
         self.__connection = connection(config.get('ip'), config.get('api_version'), config.get('ssl_certificate', False),
                                        config.get('timeout'))
-        self.__image_streamer_ip = config.get("image_streamer_ip")
         self.__validate_host()
         self.__set_proxy(config)
         self.__connection.login(config["credentials"], sessionID=sessionID)
@@ -202,8 +197,6 @@ def __init__(self, config, sessionID=None):
         self.__alerts = None
         self.__events = None
         self.__drive_enclures = None
-        self.__os_deployment_plans = None
-        self.__os_deployment_servers = None
         self.__certificate_rabbitmq = None
         self.__users = None
         self.__appliance_device_read_community = None
@@ -249,14 +242,13 @@ def from_environment_variables(cls, session_id=None):
         Construct OneViewClient using environment variables.
 
         Allowed variables: ONEVIEWSDK_IP (required), ONEVIEWSDK_USERNAME (required), ONEVIEWSDK_PASSWORD (required),
-        ONEVIEWSDK_AUTH_LOGIN_DOMAIN, ONEVIEWSDK_API_VERSION, ONEVIEWSDK_IMAGE_STREAMER_IP, ONEVIEWSDK_SESSIONID, ONEVIEWSDK_SSL_CERTIFICATE,
+        ONEVIEWSDK_AUTH_LOGIN_DOMAIN, ONEVIEWSDK_API_VERSION, ONEVIEWSDK_SESSIONID, ONEVIEWSDK_SSL_CERTIFICATE,
         ONEVIEWSDK_CONNECTION_TIMEOUT and ONEVIEWSDK_PROXY.
 
         Returns:
             OneViewClient:
         """
         ip = os.environ.get('ONEVIEWSDK_IP', '')
-        image_streamer_ip = os.environ.get('ONEVIEWSDK_IMAGE_STREAMER_IP', '')
         api_version = os.environ.get('ONEVIEWSDK_API_VERSION', '')
         ssl_certificate = os.environ.get('ONEVIEWSDK_SSL_CERTIFICATE', '')
         username = os.environ.get('ONEVIEWSDK_USERNAME', '')
@@ -267,7 +259,6 @@ def from_environment_variables(cls, session_id=None):
         timeout = os.environ.get('ONEVIEWSDK_CONNECTION_TIMEOUT')
 
         config = dict(ip=ip,
-                      image_streamer_ip=image_streamer_ip,
                       api_version=api_version,
                       ssl_certificate=ssl_certificate,
                       credentials=dict(userName=username, authLoginDomain=auth_login_domain, password=password, sessionID=sessionID),
@@ -321,23 +312,6 @@ def connection(self):
         """
         return self.__connection
 
-    def create_image_streamer_client(self):
-        """
-        Create the Image Streamer API Client.
-
-        Returns:
-            ImageStreamerClient:
-        """
-        if not self.__image_streamer_ip:
-            raise ValueError(ONEVIEW_CLIENT_INVALID_I3S_IP)
-
-        image_streamer = ImageStreamerClient(self.__image_streamer_ip,
-                                             self.__connection.get_session_id(),
-                                             self.__connection._apiVersion,
-                                             self.__connection._sslBundle)
-
-        return image_streamer
-
     @property
     def certificate_authority(self):
         """
@@ -1036,28 +1010,6 @@ def events(self):
             self.__events = Events(self.__connection)
         return self.__events
 
-    @property
-    def os_deployment_plans(self):
-        """
-        Gets the Os Deployment Plans API client.
-
-        Returns:
-            OsDeploymentPlans:
-        """
-        return OsDeploymentPlans(self.__connection)
-
-    @property
-    def os_deployment_servers(self):
-        """
-        Gets the Os Deployment Servers API client.
-
-        Returns:
-            OsDeploymentServers:
-        """
-        if not self.__os_deployment_servers:
-            self.__os_deployment_servers = OsDeploymentServers(self.__connection)
-        return self.__os_deployment_servers
-
     @property
     def certificate_rabbitmq(self):
         """
diff --git a/hpeOneView/resources/search/labels.py b/hpeOneView/resources/search/labels.py
index ac5e7fa31..b88f47c7b 100644
--- a/hpeOneView/resources/search/labels.py
+++ b/hpeOneView/resources/search/labels.py
@@ -31,7 +31,7 @@
 category_list = ['connection-templates', 'drive-enclosures', 'ethernet-networks', 'enclosures', 'enclosure-groups',
                  'fc-networks', 'fcoe-networks', 'firmware-bundles', 'hypervisor-cluster-profiles',
                  'hypervisor-host-profiles', 'hypervisor-managers', 'interconnects', 'logical-enclosures',
-                 'logical-interconnect-groups', 'logical-interconnects', 'network-sets', 'os-deployment-plans',
+                 'logical-interconnect-groups', 'logical-interconnects', 'network-sets',
                  'sas-interconnects', 'sas-logical-interconnect-groups', 'sas-logical-interconnects',
                  'sas-logical-jbods', 'scopes', 'server-hardware', 'server-profile-templates', 'server-profiles',
                  'storage-pools', 'storage-volume-sets', 'storage-volume-templates', 'storage-volumes']
diff --git a/hpeOneView/resources/settings/scopes.py b/hpeOneView/resources/settings/scopes.py
index 3412f04ed..cbbc9a8bc 100644
--- a/hpeOneView/resources/settings/scopes.py
+++ b/hpeOneView/resources/settings/scopes.py
@@ -31,7 +31,7 @@
 category_list = ['connection-templates', 'drive-enclosures', 'ethernet-networks', 'enclosures', 'enclosure-groups',
                  'fc-networks', 'fcoe-networks', 'firmware-bundles', 'hypervisor-cluster-profiles',
                  'hypervisor-host-profiles', 'hypervisor-managers', 'interconnects', 'logical-enclosures',
-                 'logical-interconnect-groups', 'logical-interconnects', 'network-sets', 'os-deployment-plans',
+                 'logical-interconnect-groups', 'logical-interconnects', 'network-sets',
                  'sas-interconnects', 'sas-logical-interconnect-groups', 'sas-logical-interconnects',
                  'sas-logical-jbods', 'scopes', 'server-hardware', 'server-profile-templates', 'server-profiles',
                  'storage-pools', 'storage-volume-sets', 'storage-volume-templates', 'storage-volumes']
diff --git a/hpeOneView/resources/uncategorized/os_deployment_plans.py b/hpeOneView/resources/uncategorized/os_deployment_plans.py
deleted file mode 100644
index 45915c8bf..000000000
--- a/hpeOneView/resources/uncategorized/os_deployment_plans.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2019] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-from future import standard_library
-
-standard_library.install_aliases()
-
-
-from hpeOneView.resources.resource import Resource, unavailable_method
-
-
-class OsDeploymentPlans(Resource):
-    URI = '/rest/os-deployment-plans/'
-
-    def __init__(self, connection, data=None):
-        super(OsDeploymentPlans, self).__init__(connection, data)
-
-    def get_all(self, start=0, count=-1, filter='', query='', sort=''):
-        """
-        Retrieves the list of registered Os Deployment plans.
-
-        Args:
-            start:
-                The first item to return, using 0-based indexing.
-                If not specified, the default is 0 - start with the first available item.
-            count:
-                The number of resources to return. A count of -1 requests all items.
-                The actual number of items in the response might differ from the requested
-                count if the sum of start and count exceeds the total number of items.
-            filter (list or str):
-                A general filter/query string to narrow the list of items returned. The
-                default is no filter; all resources are returned.
-            query:
-                 A general query string to narrow the list of resources returned. The default
-                 is no query - all resources are returned.
-            sort:
-                The sort order of the returned data set. By default, the sort order is based
-                on create time with the oldest entry first.
-
-        Returns:
-             list: Os Deployment plans
-        """
-        return self._helper.get_all(start, count, filter=filter, sort=sort, query=query)
-
-    def create(self):
-        """Create method not available for this resource"""
-        unavailable_method()
-
-    def update(self):
-        """Update method is not available for this resource"""
-        unavailable_method()
-
-    def delete(self):
-        """Delete method is not avaialble for this resource"""
-        unavailable_method()
diff --git a/hpeOneView/resources/uncategorized/os_deployment_servers.py b/hpeOneView/resources/uncategorized/os_deployment_servers.py
deleted file mode 100644
index d0aa914e9..000000000
--- a/hpeOneView/resources/uncategorized/os_deployment_servers.py
+++ /dev/null
@@ -1,249 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2019] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-from future import standard_library
-
-standard_library.install_aliases()
-
-from hpeOneView.resources.resource import ResourceClient, extract_id_from_uri
-
-
-class OsDeploymentServers(object):
-    URI = '/rest/deployment-servers'
-
-    def __init__(self, con):
-        self._connection = con
-        self._client = ResourceClient(con, self.URI)
-
-    def get_all(self, start=0, count=-1, filter='', fields='', query='', sort='', view=''):
-        """
-        Gets a list of Deployment Servers based on optional sorting and filtering, and constrained by start and count
-        parameters.
-
-        Args:
-            start:
-                The first item to return, using 0-based indexing.
-                If not specified, the default is 0 - start with the first available item.
-            count:
-                The number of resources to return. A count of -1 requests all items.
-                The actual number of items in the response might differ from the requested
-                count if the sum of start and count exceeds the total number of items.
-            filter (list or str):
-                A general filter/query string to narrow the list of items returned. The
-                default is no filter; all resources are returned.
-            fields:
-                Specifies which fields should be returned in the result set.
-            query:
-                 A general query string to narrow the list of resources returned. The default
-                 is no query - all resources are returned.
-            sort:
-                The sort order of the returned data set. By default, the sort order is based
-                on create time with the oldest entry first.
-            view:
-                Return a specific subset of the attributes of the resource or collection, by
-                specifying the name of a predefined view. The default view is expand - show all
-                attributes of the resource and all elements of collections of resources.
-
-        Returns:
-             list: Os Deployment Servers
-        """
-        return self._client.get_all(start, count, filter=filter, sort=sort, query=query, fields=fields, view=view)
-
-    def get(self, id_or_uri):
-        """
-        Get the details of the particular OS Deployment Server based on its URI or ID.
-
-        Args:
-            id_or_uri:
-                Can be either the Os Deployment Server ID or the URI
-
-        Returns:
-            dict: Os Deployment Server
-        """
-        return self._client.get(id_or_uri)
-
-    def get_by(self, field, value):
-        """
-        Gets all Os Deployment Servers that match the filter.
-        The search is case-insensitive.
-
-        Args:
-            field: field name to filter
-            value: value to filter
-
-        Returns:
-            list: Os Deployment Servers
-        """
-        return self._client.get_by(field, value)
-
-    def get_by_name(self, name):
-        """
-        Gets the Os Deployment Server by name.
-
-        Args:
-            name: Name of the Os Deployment Server
-
-        Returns:
-            dict: Os Deployment Server
-        """
-        os_deployment_server = self.get_by('name', name) or [None]
-        return os_deployment_server[0]
-
-    def add(self, resource, timeout=-1):
-        """
-        Adds a Deployment Server using the information provided in the request body. Note: The type of the Deployment
-        Server is always assigned as "Image streamer".
-
-        Args:
-            resource (dict):
-                Deployment Manager resource.
-            timeout:
-                Timeout in seconds. Wait for task completion by default. The timeout does not abort the operation
-                in OneView, just stop waiting for its completion.
-
-        Returns:
-            dict: The added resource.
-        """
-        return self._client.create(resource, timeout=timeout)
-
-    def update(self, resource, force=False, timeout=-1):
-        """
-        Updates the Deployment Server resource. The properties that are omitted (not included as part
-        of the request body) are ignored.
-
-        Args:
-            resource (dict): Object to update.
-            force:
-                If set to true, the operation completes despite any problems with network connectivity or errors on
-                the resource itself. The default is false.
-            timeout:
-                Timeout in seconds. Wait for task completion by default. The timeout does not abort the operation
-                in OneView, just stops waiting for its completion.
-
-        Returns:
-            Updated resource.
-        """
-        return self._client.update(resource, timeout=timeout, force=force)
-
-    def delete(self, resource, force=False, timeout=-1):
-        """
-        Deletes a Deployment Server object based on its UUID or URI.
-
-        Args:
-            resource (dict):
-                Object to delete.
-            force:
-                 If set to true, the operation completes despite any problems with
-                 network connectivity or errors on the resource itself. The default is false.
-            timeout:
-                Timeout in seconds. Wait for task completion by default. The timeout does not abort the operation
-                in OneView; it just stops waiting for its completion.
-
-        Returns:
-            bool: Indicates if the volume was successfully deleted.
-        """
-
-        return self._client.delete(resource, force=force, timeout=timeout)
-
-    def get_networks(self):
-        """
-        Gets a list of all the One View networks.
-
-        Returns:
-             list: Networks
-        """
-        uri = self.URI + '/network'
-        return self._client.get(uri)
-
-    def get_appliances(self, start=0, count=-1, filter='', fields='', query='', sort='', view=''):
-        """
-        Gets a list of all the Image Streamer resources based on optional sorting and filtering, and constrained
-        by start and count parameters.
-
-        Args:
-            start:
-                The first item to return, using 0-based indexing.
-                If not specified, the default is 0 - start with the first available item.
-            count:
-                The number of resources to return. A count of -1 requests all items.
-                The actual number of items in the response might differ from the requested
-                count if the sum of start and count exceeds the total number of items.
-            filter (list or str):
-                A general filter/query string to narrow the list of items returned. The
-                default is no filter; all resources are returned.
-            fields:
-                Specifies which fields should be returned in the result set.
-            query:
-                 A general query string to narrow the list of resources returned. The default
-                 is no query - all resources are returned.
-            sort:
-                The sort order of the returned data set. By default, the sort order is based
-                on create time with the oldest entry first.
-            view:
-                Return a specific subset of the attributes of the resource or collection, by
-                specifying the name of a predefined view. The default view is expand - show all
-                attributes of the resource and all elements of collections of resources.
-
-        Returns:
-             list: Image Streamer resources associated with the Deployment Servers.
-        """
-        uri = self.URI + '/image-streamer-appliances'
-        return self._client.get_all(start, count, filter=filter, sort=sort, query=query, fields=fields, view=view,
-                                    uri=uri)
-
-    def get_appliance(self, id_or_uri, fields=''):
-        """
-        Gets the particular Image Streamer resource based on its ID or URI.
-
-        Args:
-            id_or_uri:
-                Can be either the Os Deployment Server ID or the URI
-            fields:
-                Specifies which fields should be returned in the result.
-
-        Returns:
-             dict: Image Streamer resource.
-        """
-        uri = self.URI + '/image-streamer-appliances/' + extract_id_from_uri(id_or_uri)
-        if fields:
-            uri += '?fields=' + fields
-
-        return self._client.get(uri)
-
-    def get_appliance_by_name(self, appliance_name):
-        """
-        Gets the particular Image Streamer resource based on its name.
-
-        Args:
-            appliance_name:
-                The Image Streamer resource name.
-
-        Returns:
-             dict: Image Streamer resource.
-        """
-        appliances = self.get_appliances()
-
-        if appliances:
-            for appliance in appliances:
-                if appliance['name'] == appliance_name:
-                    return appliance
-        return None


Test patch:
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 2b428501b..e830d683b 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -10,7 +10,7 @@ jobs:
       matrix:
         python_version:
         - 3.6
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v2
@@ -37,7 +37,7 @@ jobs:
        build_dir: docs/build/html/.
       env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      
+
     - name: coveralls
       uses: AndreMiras/coveralls-python-action@develop
       with:
diff --git a/tests/unit/image_streamer/__init__.py b/tests/unit/image_streamer/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/unit/image_streamer/resources/__init__.py b/tests/unit/image_streamer/resources/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/unit/image_streamer/resources/test_artifact_bundles.py b/tests/unit/image_streamer/resources/test_artifact_bundles.py
deleted file mode 100644
index 6ec15b622..000000000
--- a/tests/unit/image_streamer/resources/test_artifact_bundles.py
+++ /dev/null
@@ -1,139 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2020] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from unittest import TestCase
-
-import mock
-
-from hpeOneView.connection import connection
-from hpeOneView.image_streamer.resources.artifact_bundles import ArtifactBundles
-from hpeOneView.resources.resource import Resource, ResourceHelper, ResourceFileHandlerMixin
-
-
-class ArtifactBundlesTest(TestCase):
-    def setUp(self):
-        self.host = '127.0.0.1'
-        self.connection = connection(self.host, 800)
-        self._artifact_bundles = ArtifactBundles(self.connection)
-        self.uri = "/rest/artifact-bundles/test"
-        self._artifact_bundles.data = {"uri": self.uri}
-
-    @mock.patch.object(Resource, 'get_all')
-    def test_get_all_called_once(self, mock_get_all):
-        filter = 'name=TestName'
-        sort = 'name:ascending'
-
-        self._artifact_bundles.get_all(2, 500, filter=filter, sort=sort)
-        mock_get_all.assert_called_once_with(2, 500, filter=filter, sort=sort)
-
-    @mock.patch.object(Resource, 'get_all')
-    def test_get_all_called_once_with_default(self, mock_get_all):
-        self._artifact_bundles.get_all()
-        mock_get_all.assert_called_once_with()
-
-    @mock.patch.object(ResourceHelper, 'get_collection')
-    def test_get_all_backups_called_once(self, mock_get_collection):
-        uri = '/rest/artifact-bundles/backups'
-        self._artifact_bundles.get_all_backups()
-        mock_get_collection.assert_called_once_with(uri=uri)
-
-    @mock.patch.object(Resource, 'get_by_uri')
-    def test_get_backups_by_id_called_once(self, mock_get):
-        uri = '/rest/artifact-bundles/backups/test'
-        self._artifact_bundles.get_backup(uri)
-        mock_get.assert_called_once_with(uri)
-
-    @mock.patch.object(ResourceFileHandlerMixin, 'download')
-    def test_download_archive_artifact_bundle_by_uri_called_once(self, mock_download):
-        destination = '~/image.zip'
-        expected_uri = '/rest/artifact-bundles/backups/archive/test'
-
-        self._artifact_bundles.download_archive(destination)
-        mock_download.assert_called_once_with(expected_uri, destination)
-
-    @mock.patch.object(ResourceFileHandlerMixin, 'download')
-    def test_download_called_once_by_uri(self, mock_download):
-        destination = '~/image.zip'
-
-        self._artifact_bundles.download(destination)
-        mock_download.assert_called_once_with('/rest/artifact-bundles/download/test', destination)
-
-    @mock.patch.object(Resource, 'create')
-    def test_create_backup_called_once(self, mock_create):
-        information = {
-            "deploymentGroupURI": "/rest/deployment-groups/00c1344d-e4dd-43c3-a733-1664e159a36f"
-        }
-        uri = '/rest/artifact-bundles/backups'
-        mock_create.return_value = {}
-
-        self._artifact_bundles.create_backup(information)
-        mock_create.assert_called_once_with(information.copy(), uri=uri, timeout=-1)
-
-    @mock.patch.object(ResourceFileHandlerMixin, 'upload')
-    def test_upload_artifact_bundle_called_once(self, mock_upload):
-        filepath = "~/upload.zip"
-
-        self._artifact_bundles.upload_bundle_from_file(filepath)
-        mock_upload.assert_called_once_with(filepath)
-
-    @mock.patch.object(ResourceFileHandlerMixin, 'upload')
-    def test_upload_backup_artifact_bundle_called_once(self, mock_upload):
-        filepath = "~/upload.zip"
-        deployment_groups = "/rest/deployment-groups/00c1344d-e4dd-43c3-a733-1664e159a36f"
-        expected_uri = '/rest/artifact-bundles/backups/archive?deploymentGrpUri=' + deployment_groups
-
-        self._artifact_bundles.upload_backup_bundle_from_file(filepath, deployment_groups)
-        mock_upload.assert_called_once_with(filepath, expected_uri)
-
-    @mock.patch.object(ResourceHelper, 'update')
-    def test_extract_called_once(self, mock_update):
-        mock_update.return_value = {}
-        resource = {}
-        uri = '/rest/artifact-bundles/test?extract=true&forceImport=true'
-        custom_headers = {'Content-Type': 'text/plain;charset=UTF-8'}
-
-        self._artifact_bundles.extract(resource)
-        mock_update.assert_called_once_with(resource, uri, custom_headers=custom_headers, timeout=-1)
-
-    @mock.patch.object(ResourceHelper, 'update')
-    def test_extract_backup_bundle_called_once(self, mock_update):
-        mock_update.return_value = {}
-
-        data = {
-            'deploymentGroupURI': '/rest/deployment-groups/00c1344d-e4dd-43c3-a733-1664e159a36f'
-        }
-
-        uri = '/rest/artifact-bundles/backups/test'
-
-        self._artifact_bundles.extract_backup(data)
-        mock_update.assert_called_once_with(data, uri, timeout=-1)
-
-    @mock.patch.object(ResourceHelper, 'update')
-    def test_stop_creation_called_once(self, mock_update):
-        mock_update.return_value = {}
-
-        task_uri = "/rest/tasks/A15F9270-46FC-48DF-94A9-D11EDB52877E"
-
-        artifact_uri = "/rest/artifact-bundles/test"
-        uri = artifact_uri + '/stopArtifactCreate'
-
-        data = {
-            'taskUri': task_uri
-        }
-
-        self._artifact_bundles.stop_artifact_creation(task_uri)
-        mock_update.assert_called_once_with(data, uri=uri)
diff --git a/tests/unit/image_streamer/resources/test_build_plans.py b/tests/unit/image_streamer/resources/test_build_plans.py
deleted file mode 100644
index 1885d28cf..000000000
--- a/tests/unit/image_streamer/resources/test_build_plans.py
+++ /dev/null
@@ -1,114 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2020] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from unittest import TestCase
-
-import mock
-
-from hpeOneView.connection import connection
-from hpeOneView.image_streamer.resources.build_plans import BuildPlans
-from hpeOneView.resources.resource import ResourceClient
-
-
-class BuildPlansTest(TestCase):
-    def setUp(self):
-        self.host = '127.0.0.1'
-        self.connection = connection(self.host, 800)
-        self._client = BuildPlans(self.connection)
-
-    @mock.patch.object(ResourceClient, 'get_all')
-    def test_get_all_called_once(self, mock_get_all):
-        filter = 'name=TestName'
-        sort = 'name:ascending'
-
-        self._client.get_all(2, 500, filter, sort)
-
-        mock_get_all.assert_called_once_with(2, 500, filter=filter, sort=sort)
-
-    @mock.patch.object(ResourceClient, 'get_all')
-    def test_get_all_called_once_with_default_values(self, mock_get_all):
-        self._client.get_all()
-
-        mock_get_all.assert_called_once_with(0, -1, filter='', sort='')
-
-    @mock.patch.object(ResourceClient, 'get_by')
-    def test_get_by_called_once(self, mock_get_by):
-        self._client.get_by('name', 'Build Plan Name')
-
-        mock_get_by.assert_called_once_with(
-            'name', 'Build Plan Name')
-
-    @mock.patch.object(ResourceClient, 'get')
-    def test_get_called_once(self, mock_get):
-        self._client.get('3518be0e-17c1-4189-8f81-83f3724f6155')
-
-        mock_get.assert_called_once_with(
-            '3518be0e-17c1-4189-8f81-83f3724f6155')
-
-    @mock.patch.object(ResourceClient, 'get')
-    def test_get_with_uri_called_once(self, mock_get):
-        uri = '/rest/build-plans/3518be0e-17c1-4189-8f81-83f3724f6155'
-        self._client.get(uri)
-
-        mock_get.assert_called_once_with(uri)
-
-    @mock.patch.object(ResourceClient, 'create')
-    def test_create_called_once_with_default_type(self, mock_create):
-        information = {
-            "name": "OS Build Plan Name",
-        }
-        mock_create.return_value = {}
-
-        self._client.create(information)
-        mock_create.assert_called_once_with(information, timeout=-1, default_values=self._client.DEFAULT_VALUES)
-
-    @mock.patch.object(ResourceClient, 'create')
-    def test_create_called_once_with_provided_type(self, mock_create):
-        information = {
-            "name": "OS Build Plan Name",
-        }
-        mock_create.return_value = {}
-
-        self._client.create(information)
-        mock_create.assert_called_once_with(information, timeout=-1, default_values=self._client.DEFAULT_VALUES)
-
-    @mock.patch.object(ResourceClient, 'update')
-    def test_update_called_once(self, mock_update):
-        information = {
-            "type": "OeBuildPlan",
-            "name": "OS Build Plan Name",
-            "description": "Description of the build plan",
-        }
-        expected_data = information.copy()
-        mock_update.return_value = {}
-
-        self._client.update(information)
-        mock_update.assert_called_once_with(expected_data, timeout=-1)
-
-    @mock.patch.object(ResourceClient, 'delete')
-    def test_delete_called_once(self, mock_delete):
-        id = 'ad28cf21-8b15-4f92-bdcf-51cb2042db32'
-        self._client.delete(id, force=False)
-
-        mock_delete.assert_called_once_with(id, force=False, timeout=-1)
-
-    @mock.patch.object(ResourceClient, 'delete')
-    def test_delete_called_once_with_force(self, mock_delete):
-        id = 'ad28cf21-8b15-4f92-bdcf-51cb2042db32'
-        self._client.delete(id, force=True)
-
-        mock_delete.assert_called_once_with(id, force=True, timeout=-1)
diff --git a/tests/unit/image_streamer/resources/test_deployment_groups.py b/tests/unit/image_streamer/resources/test_deployment_groups.py
deleted file mode 100644
index 6812faed1..000000000
--- a/tests/unit/image_streamer/resources/test_deployment_groups.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2020] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from unittest import TestCase
-
-import mock
-
-from hpeOneView.connection import connection
-from hpeOneView.image_streamer.resources.deployment_groups import DeploymentGroups
-from hpeOneView.resources.resource import ResourceClient
-
-
-class DeploymentGroupsTest(TestCase):
-    def setUp(self):
-        self.host = '127.0.0.1'
-        self.connection = connection(self.host, 800)
-        self._client = DeploymentGroups(self.connection)
-
-    @mock.patch.object(ResourceClient, 'get_all')
-    def test_get_all_called_once(self, mock_get_all):
-        filter = 'name=TestName'
-        sort = 'name:ascending'
-
-        self._client.get_all(2, 500, filter, sort)
-
-        mock_get_all.assert_called_once_with(2, 500, filter=filter, sort=sort)
-
-    @mock.patch.object(ResourceClient, 'get_all')
-    def test_get_all_called_once_with_default_values(self, mock_get_all):
-        self._client.get_all()
-
-        mock_get_all.assert_called_once_with(0, -1, filter='', sort='')
-
-    @mock.patch.object(ResourceClient, 'get')
-    def test_get_called_once(self, mock_get):
-        self._client.get('57f2d803-9c11-4f9a-bc02-71804a0fcc3e')
-
-        mock_get.assert_called_once_with('57f2d803-9c11-4f9a-bc02-71804a0fcc3e')
-
-    @mock.patch.object(ResourceClient, 'get_by')
-    def test_get_by_called_once(self, mock_get_by):
-        self._client.get_by('name', 'OSS')
-
-        mock_get_by.assert_called_once_with('name', 'OSS')
-
-    @mock.patch.object(ResourceClient, 'get_by')
-    def test_get_by_name_called_once(self, mock_get_by):
-        self._client.get_by_name('OSS')
-
-        mock_get_by.assert_called_once_with('name', 'OSS')
diff --git a/tests/unit/image_streamer/resources/test_deployment_plans.py b/tests/unit/image_streamer/resources/test_deployment_plans.py
deleted file mode 100644
index 173c390ea..000000000
--- a/tests/unit/image_streamer/resources/test_deployment_plans.py
+++ /dev/null
@@ -1,129 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2020] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from unittest import TestCase
-
-import mock
-
-from hpeOneView.connection import connection
-from hpeOneView.image_streamer.resources.deployment_plans import DeploymentPlans
-from hpeOneView.resources.resource import ResourceHelper, Resource
-
-
-class DeploymentPlansTest(TestCase):
-    def setUp(self):
-        self.host = '127.0.0.1'
-        self.connection = connection(self.host, 800)
-        self._client = DeploymentPlans(self.connection)
-        self.resource_uri = '/rest/deployment-plans/ad28cf21-8b15-4f92-bdcf-51cb2042db32'
-        self._client.data = {'uri': self.resource_uri}
-
-    @mock.patch.object(ResourceHelper, 'get_all')
-    def test_get_all_called_once(self, mock_get_all):
-        filter = 'name=TestName'
-        sort = 'name:ascending'
-
-        self._client.get_all(2, 500, filter, sort)
-
-        mock_get_all.assert_called_once_with(count=500, filter='name=TestName',
-                                             sort='name:ascending', start=2)
-
-    @mock.patch.object(ResourceHelper, 'get_all')
-    def test_get_all_called_once_with_default_values(self, mock_get_all):
-        self._client.get_all()
-
-        mock_get_all.assert_called_once_with(count=-1, filter=u'', sort=u'', start=0)
-
-    @mock.patch.object(Resource, 'get_by')
-    def test_get_by_called_once(self, mock_get_by):
-        self._client.get_by('name', 'Deployment Plan Name')
-
-        mock_get_by.assert_called_once_with('name', 'Deployment Plan Name')
-
-    @mock.patch.object(ResourceHelper, 'create')
-    def test_create_called_once_with_default_type(self, mock_create):
-        information = {
-            "name": "Deployment Plan Name",
-        }
-        mock_create.return_value = {}
-
-        self._client.create(information)
-
-        expected_data = {
-            "type": "OEDeploymentPlan",
-            "name": "Deployment Plan Name",
-        }
-        mock_create.assert_called_once_with(expected_data, None, -1,
-                                            None, False)
-
-    @mock.patch.object(ResourceHelper, 'create')
-    def test_create_called_once_with_provided_type(self, mock_create):
-        information = {
-            "type": "OEDeploymentPlan",
-            "name": "Deployment Plan Name",
-        }
-        expected_data = information.copy()
-        mock_create.return_value = {}
-
-        self._client.create(information)
-        mock_create.assert_called_once_with(expected_data, None, -1, None, False)
-
-    @mock.patch.object(ResourceHelper, 'update')
-    @mock.patch.object(ResourceHelper, 'do_get')
-    def test_update_called_once(self, mock_get, mock_update):
-        information = {
-            "type": "OEDeploymentPlan",
-            "name": "Deployment Plan Name",
-            "description": "Description of the deployment plan",
-            "uri": self._client.data["uri"]
-        }
-        expected_data = information.copy()
-        mock_update.return_value = {}
-
-        self._client.update(information)
-        mock_update.assert_called_once_with(expected_data,
-                                            self.resource_uri, False, -1, None)
-
-    @mock.patch.object(ResourceHelper, 'do_get')
-    def test_osdp_called_once(self, mock_get_osdp):
-        self._client.get_osdp()
-
-        expected_uri = '{}/osdp'.format(self.resource_uri)
-        mock_get_osdp.assert_called_once_with(expected_uri)
-
-    @mock.patch.object(ResourceHelper, 'do_get')
-    def test_usedby_called_once(self, mock_get_usedby):
-        self._client.get_usedby()
-
-        expected_uri = '{}/usedby'.format(self.resource_uri)
-        mock_get_usedby.assert_called_once_with(expected_uri)
-
-    @mock.patch.object(ResourceHelper, 'delete')
-    def test_delete_called_once(self, mock_delete):
-        self._client.delete(force=False)
-
-        mock_delete.assert_called_once_with(self.resource_uri,
-                                            custom_headers=None, force=False,
-                                            timeout=-1)
-
-    @mock.patch.object(ResourceHelper, 'delete')
-    def test_delete_called_once_with_force(self, mock_delete):
-        self._client.delete(force=True)
-
-        mock_delete.assert_called_once_with(self.resource_uri,
-                                            custom_headers=None, force=True,
-                                            timeout=-1)
diff --git a/tests/unit/image_streamer/resources/test_golden_images.py b/tests/unit/image_streamer/resources/test_golden_images.py
deleted file mode 100644
index dc664031a..000000000
--- a/tests/unit/image_streamer/resources/test_golden_images.py
+++ /dev/null
@@ -1,182 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2020] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from unittest import TestCase
-
-import mock
-
-from hpeOneView.connection import connection
-from hpeOneView.image_streamer.resources.golden_images import GoldenImages
-from hpeOneView.resources.resource import ResourceClient
-
-
-class GoldenImagesTest(TestCase):
-    def setUp(self):
-        self.host = '127.0.0.1'
-        self.connection = connection(self.host, 800)
-        self._client = GoldenImages(self.connection)
-
-    @mock.patch.object(ResourceClient, 'get_all')
-    def test_get_all_called_once(self, mock_get_all):
-        filter = 'name=TestName'
-        sort = 'name:ascending'
-
-        self._client.get_all(2, 500, filter, sort)
-
-        mock_get_all.assert_called_once_with(2, 500, filter=filter, sort=sort)
-
-    @mock.patch.object(ResourceClient, 'get_all')
-    def test_get_all_called_once_with_default_values(self, mock_get_all):
-        self._client.get_all()
-
-        mock_get_all.assert_called_once_with(0, -1, filter='', sort='')
-
-    @mock.patch.object(ResourceClient, 'get_by')
-    def test_get_by_called_once(self, mock_get_by):
-        self._client.get_by('name', 'GoldenImage')
-
-        mock_get_by.assert_called_once_with(
-            'name', 'GoldenImage')
-
-    @mock.patch.object(ResourceClient, 'create')
-    def test_create_called_once(self, mock_create):
-        information = {
-            "type": "GoldenImage",
-            "description": "Description of this Golden Image",
-        }
-        mock_create.return_value = {}
-
-        self._client.create(information)
-        mock_create.assert_called_once_with(information.copy(), timeout=-1)
-
-    @mock.patch.object(ResourceClient, 'update')
-    def test_update_called_once(self, mock_update):
-        information = {
-            "type": "GoldenImage",
-            "description": "Description of this Golden Image",
-        }
-        mock_update.return_value = {}
-
-        self._client.update(information)
-        mock_update.assert_called_once_with(information.copy(), timeout=-1)
-
-    @mock.patch.object(ResourceClient, 'get')
-    def test_get_called_once(self, mock_get):
-        self._client.get('3518be0e-17c1-4189-8f81-83f3724f6155')
-
-        mock_get.assert_called_once_with(
-            '3518be0e-17c1-4189-8f81-83f3724f6155')
-
-    @mock.patch.object(ResourceClient, 'get')
-    def test_get_with_uri_called_once(self, mock_get):
-        uri = '/rest/plan-scripts/3518be0e-17c1-4189-8f81-83f3724f6155'
-        self._client.get(uri)
-
-        mock_get.assert_called_once_with(uri)
-
-    @mock.patch.object(ResourceClient, 'delete')
-    def test_remove_called_once(self, mock_delete):
-        id = 'ad28cf21-8b15-4f92-bdcf-51cb2042db32'
-        self._client.delete(id, force=False)
-
-        mock_delete.assert_called_once_with(id, force=False, timeout=-1)
-
-    @mock.patch.object(ResourceClient, 'delete')
-    def test_remove_called_once_with_force(self, mock_delete):
-        id = 'ad28cf21-8b15-4f92-bdcf-51cb2042db32'
-        self._client.delete(id, force=True)
-
-        mock_delete.assert_called_once_with(id, force=True, timeout=-1)
-
-    @mock.patch.object(ResourceClient, 'upload')
-    def test_upload_post_multipart_called_once(self, mock_upload):
-        information = {
-            "name": "GoldenImageName",
-            "description": "Description of this Golden Image",
-        }
-        filepath = "test/SPPgen9snap6.2015_0405.81.iso"
-
-        self._client.upload(filepath, information)
-
-        expected_uri = '/rest/golden-images?name=GoldenImageName&description=Description%20of%20this%20Golden%20Image'
-
-        mock_upload.assert_called_once_with(filepath, expected_uri)
-
-    @mock.patch.object(ResourceClient, 'upload')
-    def test_upload_without_description(self, mock_upload):
-        information = {
-            "name": "GoldenImageName",
-        }
-
-        filepath = "test/SPPgen9snap6.2015_0405.81.iso"
-
-        self._client.upload(filepath, information)
-
-        expected_uri = '/rest/golden-images?name=GoldenImageName&description='
-
-        mock_upload.assert_called_once_with(filepath, expected_uri)
-
-    @mock.patch.object(ResourceClient, 'upload')
-    def test_upload_with_empty_information(self, mock_upload):
-        information = {}
-        filepath = "test/SPPgen9snap6.2015_0405.81.iso"
-
-        self._client.upload(filepath, information)
-
-        expected_uri = '/rest/golden-images?name=&description='
-
-        mock_upload.assert_called_once_with(filepath, expected_uri)
-
-    @mock.patch.object(ResourceClient, 'download')
-    def test_download_archive_called_once_with_id(self, mock_download):
-        id = '3518be0e-17c1-4189-8f81-83f3724f6155'
-        file_path = "~/archive.log"
-
-        self._client.download_archive(id, file_path)
-
-        mock_download.assert_called_once_with('/rest/golden-images/archive/3518be0e-17c1-4189-8f81-83f3724f6155',
-                                              file_path)
-
-    @mock.patch.object(ResourceClient, 'download')
-    def test_download_archive_called_once_with_uri(self, mock_download):
-        uri = '/rest/golden-images/3518be0e-17c1-4189-8f81-83f3724f6155'
-        file_path = "~/archive.log"
-
-        self._client.download_archive(uri, file_path)
-
-        mock_download.assert_called_once_with('/rest/golden-images/archive/3518be0e-17c1-4189-8f81-83f3724f6155',
-                                              file_path)
-
-    @mock.patch.object(ResourceClient, 'download')
-    def test_download_called_once_with_uri(self, mock_download):
-        uri = '/rest/golden-images/3518be0e-17c1-4189-8f81-83f3724f6155'
-        file_path = "~/archive.log"
-
-        self._client.download(uri, file_path)
-
-        mock_download.assert_called_once_with('/rest/golden-images/download/3518be0e-17c1-4189-8f81-83f3724f6155',
-                                              file_path)
-
-    @mock.patch.object(ResourceClient, 'download')
-    def test_download_called_once_with_id(self, mock_download):
-        id = '3518be0e-17c1-4189-8f81-83f3724f6155'
-        file_path = "~/archive.log"
-
-        self._client.download(id, file_path)
-
-        mock_download.assert_called_once_with('/rest/golden-images/download/3518be0e-17c1-4189-8f81-83f3724f6155',
-                                              file_path)
diff --git a/tests/unit/image_streamer/resources/test_os_volumes.py b/tests/unit/image_streamer/resources/test_os_volumes.py
deleted file mode 100644
index 55bf088f7..000000000
--- a/tests/unit/image_streamer/resources/test_os_volumes.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2020] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from unittest import TestCase
-
-import mock
-
-from hpeOneView.connection import connection
-from hpeOneView.image_streamer.resources.os_volumes import OsVolumes
-from hpeOneView.resources.resource import ResourceClient
-
-
-class OsVolumesTest(TestCase):
-    def setUp(self):
-        self.host = '127.0.0.1'
-        self.connection = connection(self.host, 800)
-        self._client = OsVolumes(self.connection)
-
-    @mock.patch.object(ResourceClient, 'get_all')
-    def test_get_all_called_once(self, mock_get_all):
-        filter = 'name=TestName'
-        sort = 'name:ascending'
-
-        self._client.get_all(2, 500, filter, sort)
-
-        mock_get_all.assert_called_once_with(2, 500, filter=filter, sort=sort)
-
-    @mock.patch.object(ResourceClient, 'get_all')
-    def test_get_all_called_once_with_default_values(self, mock_get_all):
-        self._client.get_all()
-
-        mock_get_all.assert_called_once_with(0, -1, filter='', sort='')
-
-    @mock.patch.object(ResourceClient, 'get')
-    def test_get_called_once(self, mock_get):
-        self._client.get('57f2d803-9c11-4f9a-bc02-71804a0fcc3e')
-
-        mock_get.assert_called_once_with(
-            '57f2d803-9c11-4f9a-bc02-71804a0fcc3e')
-
-    @mock.patch.object(ResourceClient, 'get_by')
-    def test_get_by_called_once(self, mock_get_by):
-        self._client.get_by('name', 'OSVolume-5')
-
-        mock_get_by.assert_called_once_with(
-            'name', 'OSVolume-5')
-
-    @mock.patch.object(ResourceClient, 'get_by_name')
-    def test_get_by_name_called_once(self, mock_get_by):
-        self._client.get_by_name('OSVolume-5')
-
-        mock_get_by.assert_called_once_with('OSVolume-5')
-
-    @mock.patch.object(ResourceClient, 'download')
-    def test_download_archive_called_once_with_id(self, mock_download):
-        id = '3518be0e-17c1-4189-8f81-83f3724f6155'
-
-        self._client.download_archive(id, "~/archive.log")
-
-        mock_download.assert_called_once_with('/rest/os-volumes/archive/3518be0e-17c1-4189-8f81-83f3724f6155',
-                                              '~/archive.log')
-
-    @mock.patch.object(ResourceClient, 'download')
-    def test_download_archive_called_once_with_uri(self, mock_download):
-        name = "fake"
-        uri = '/rest/os-volumes/archive/fake'
-
-        self._client.download_archive(name, "~/archive.log")
-        mock_download.assert_called_once_with(uri, '~/archive.log')
-
-    @mock.patch.object(ResourceClient, 'get')
-    def test_get_storage(self, mock_get):
-        volume_id = '3518be0e-17c1-4189-8f81-83f3724f6155'
-        self._client.get_storage(volume_id)
-        mock_get.assert_called_once_with('/rest/os-volumes/3518be0e-17c1-4189-8f81-83f3724f6155/storage')
diff --git a/tests/unit/image_streamer/resources/test_plan_scripts.py b/tests/unit/image_streamer/resources/test_plan_scripts.py
deleted file mode 100644
index 712854b95..000000000
--- a/tests/unit/image_streamer/resources/test_plan_scripts.py
+++ /dev/null
@@ -1,128 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2020] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from unittest import TestCase
-
-import mock
-
-from hpeOneView.connection import connection
-from hpeOneView.image_streamer.resources.plan_scripts import PlanScripts
-from hpeOneView.resources.resource import ResourceClient
-
-
-class PlanScriptsTest(TestCase):
-    def setUp(self):
-        self.host = '127.0.0.1'
-        self.connection = connection(self.host, 800)
-        self._client = PlanScripts(self.connection)
-
-    @mock.patch.object(ResourceClient, 'get_all')
-    def test_get_all_called_once(self, mock_get_all):
-        filter = 'name=TestName'
-        sort = 'name:ascending'
-
-        self._client.get_all(2, 500, filter, sort)
-
-        mock_get_all.assert_called_once_with(2, 500, filter=filter, sort=sort)
-
-    @mock.patch.object(ResourceClient, 'get_all')
-    def test_get_all_called_once_with_default_values(self, mock_get_all):
-        self._client.get_all()
-
-        mock_get_all.assert_called_once_with(0, -1, filter='', sort='')
-
-    @mock.patch.object(ResourceClient, 'get_by')
-    def test_get_by_called_once(self, mock_get_by):
-        self._client.get_by('name', 'PlanScript')
-
-        mock_get_by.assert_called_once_with(
-            'name', 'PlanScript')
-
-    @mock.patch.object(ResourceClient, 'create')
-    def test_create_called_once(self, mock_create):
-        information = {
-            "type": "PlanScript",
-            "description": "Description of this plan script",
-        }
-        mock_create.return_value = {}
-
-        self._client.create(information)
-        mock_create.assert_called_once_with(information.copy(), timeout=-1)
-
-    @mock.patch.object(ResourceClient, 'update')
-    def test_update_called_once(self, mock_update):
-        information = {
-            "type": "PlanScript",
-            "description": "Description of this plan script",
-        }
-        mock_update.return_value = {}
-
-        self._client.update(information)
-        mock_update.assert_called_once_with(information.copy(), timeout=-1)
-
-    @mock.patch.object(ResourceClient, 'get')
-    def test_get_called_once(self, mock_get):
-        self._client.get('3518be0e-17c1-4189-8f81-83f3724f6155')
-
-        mock_get.assert_called_once_with(
-            '3518be0e-17c1-4189-8f81-83f3724f6155')
-
-    @mock.patch.object(ResourceClient, 'get')
-    def test_get_with_uri_called_once(self, mock_get):
-        uri = '/rest/plan-scripts/3518be0e-17c1-4189-8f81-83f3724f6155'
-        self._client.get(uri)
-
-        mock_get.assert_called_once_with(uri)
-
-    @mock.patch.object(ResourceClient, 'delete')
-    def test_remove_called_once(self, mock_delete):
-        id = 'ad28cf21-8b15-4f92-bdcf-51cb2042db32'
-        self._client.delete(id, force=False)
-
-        mock_delete.assert_called_once_with(id, force=False, timeout=-1)
-
-    @mock.patch.object(ResourceClient, 'delete')
-    def test_remove_called_once_with_force(self, mock_delete):
-        id = 'ad28cf21-8b15-4f92-bdcf-51cb2042db32'
-        self._client.delete(id, force=True)
-
-        mock_delete.assert_called_once_with(id, force=True, timeout=-1)
-
-    @mock.patch.object(ResourceClient, 'create')
-    def test_retrieve_differences_with_uri(self, mock_create):
-        uri = '/rest/plan-scripts/3518be0e-17c1-4189-8f81-83f3724f6155'
-        self._client.retrieve_differences(uri, "content")
-
-        mock_create.assert_called_once_with("content",
-                                            timeout=-1,
-                                            uri='/rest/plan-scripts/differences/3518be0e-17c1-4189-8f81-83f3724f6155')
-
-    @mock.patch.object(ResourceClient, 'create')
-    def test_retrieve_differences_with_id(self, mock_create):
-        id = '3518be0e-17c1-4189-8f81-83f3724f6155'
-        self._client.retrieve_differences(id, "content")
-
-        mock_create.assert_called_once_with("content",
-                                            timeout=-1,
-                                            uri='/rest/plan-scripts/differences/3518be0e-17c1-4189-8f81-83f3724f6155')
-
-    @mock.patch.object(ResourceClient, 'get')
-    def test_get_usedby_and_readonly(self, mock_get):
-        self._client.get_usedby_and_readonly('cbfd487e-3d92-4eb4-b877-f9ea7c16a271')
-
-        mock_get.assert_called_once_with(
-            '/rest/plan-scripts/cbfd487e-3d92-4eb4-b877-f9ea7c16a271/usedby/readonly')
diff --git a/tests/unit/image_streamer/test_image_streamer_client.py b/tests/unit/image_streamer/test_image_streamer_client.py
deleted file mode 100644
index f48ab309e..000000000
--- a/tests/unit/image_streamer/test_image_streamer_client.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2020] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from unittest import TestCase
-
-from hpeOneView.image_streamer.image_streamer_client import ImageStreamerClient
-from hpeOneView.image_streamer.resources.plan_scripts import PlanScripts
-from hpeOneView.image_streamer.resources.golden_images import GoldenImages
-from hpeOneView.image_streamer.resources.build_plans import BuildPlans
-from hpeOneView.image_streamer.resources.os_volumes import OsVolumes
-from hpeOneView.image_streamer.resources.deployment_plans import DeploymentPlans
-from hpeOneView.image_streamer.resources.artifact_bundles import ArtifactBundles
-from hpeOneView.image_streamer.resources.deployment_groups import DeploymentGroups
-
-
-class ImageStreamerClientTest(TestCase):
-    def setUp(self):
-        self.host = '127.0.0.1'
-        self.session_id = 'LTU1NzIzMDMxMjIxcsgLtu5d6Q_oydNqaO2oWuZz5Xj7L7cc'
-        self._client = ImageStreamerClient(self.host, self.session_id, 300)
-
-    def test_connection_has_right_host(self):
-        self.assertEqual(self._client.connection.get_host(), self.host)
-
-    def test_connection_has_right_session_id(self):
-        self.assertEqual(self._client.connection.get_session_id(), self.session_id)
-
-    def test_connection_has_session(self):
-        self.assertEqual(self._client.connection.get_session(), True)
-
-    def test_golden_images_has_right_type(self):
-        self.assertIsInstance(self._client.golden_images, GoldenImages)
-
-    def test_golden_images_lazy_loading(self):
-        resource = self._client.golden_images
-        self.assertEqual(resource, self._client.golden_images)
-
-    def test_plan_scripts_has_right_type(self):
-        self.assertIsInstance(self._client.plan_scripts, PlanScripts)
-
-    def test_plan_scripts_lazy_loading(self):
-        resource = self._client.plan_scripts
-        self.assertEqual(resource, self._client.plan_scripts)
-
-    def test_build_plans_has_right_type(self):
-        self.assertIsInstance(self._client.build_plans, BuildPlans)
-
-    def test_build_plans_lazy_loading(self):
-        resource = self._client.build_plans
-        self.assertEqual(resource, self._client.build_plans)
-
-    def test_os_volumes_has_right_type(self):
-        self.assertIsInstance(self._client.os_volumes, OsVolumes)
-
-    def test_os_volumes_lazy_loading(self):
-        resource = self._client.os_volumes
-        self.assertEqual(resource, self._client.os_volumes)
-
-    def test_deployment_plans_has_right_type(self):
-        self.assertIsInstance(self._client.deployment_plans, DeploymentPlans)
-
-    def test_deployment_plans_client(self):
-        resource = self._client.deployment_plans
-        self.assertNotEqual(resource, self._client.deployment_plans)
-
-    def test_artifact_bundles_has_right_type(self):
-        self.assertIsInstance(self._client.artifact_bundles, ArtifactBundles)
-
-    def test_artifact_bundles_client(self):
-        resource = self._client.artifact_bundles
-        self.assertNotEqual(resource, self._client.artifact_bundles)
-
-    def test_deployment_groups_has_right_type(self):
-        self.assertIsInstance(self._client.deployment_groups, DeploymentGroups)
-
-    def test_deployment_groups_lazy_loading(self):
-        resource = self._client.deployment_groups
-        self.assertEqual(resource, self._client.deployment_groups)
diff --git a/tests/unit/resources/uncategorized/test_os_deployment_plans.py b/tests/unit/resources/uncategorized/test_os_deployment_plans.py
deleted file mode 100644
index c1b8bea39..000000000
--- a/tests/unit/resources/uncategorized/test_os_deployment_plans.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2020] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from unittest import TestCase
-
-import mock
-
-from hpeOneView.connection import connection
-from hpeOneView.resources.resource import ResourceHelper
-from hpeOneView.resources.uncategorized.os_deployment_plans import OsDeploymentPlans
-
-
-class OsDeploymentPlansTest(TestCase):
-    RESOURCE_ID = "81decf85-0dff-4a5e-8a95-52994eeb6493"
-    RESOURCE_URI = "/rest/os-deployment-plans/" + RESOURCE_ID
-
-    def setUp(self):
-        self.host = '127.0.0.1'
-        self.connection = connection(self.host, 800)
-        self._os_deployment_plans = OsDeploymentPlans(self.connection)
-
-    @mock.patch.object(ResourceHelper, 'get_all')
-    def test_get_all_called_once(self, mock_get_all):
-        filter = 'name=TestName'
-        sort = 'name:ascending'
-
-        self._os_deployment_plans.get_all(2, 500, filter=filter, sort=sort)
-
-        mock_get_all.assert_called_once_with(2, 500, filter=filter, sort=sort, query='')
-
-    @mock.patch.object(ResourceHelper, 'get_all')
-    def test_get_all_called_once_with_default(self, mock_get_all):
-        self._os_deployment_plans.get_all()
-        mock_get_all.assert_called_once_with(0, -1, filter='', sort='', query='')
-
-    @mock.patch.object(ResourceHelper, 'get_all')
-    def test_get_by_called_once(self, mock_get_by):
-        self._os_deployment_plans.get_by("name", "test name")
-        mock_get_by.assert_called_once_with(0, -1, filter='"name=\'test name\'"',
-                                            query='', sort='')
-
-    @mock.patch.object(ResourceHelper, 'get_all')
-    def test_get_by_name_sould_return_none_when_resource_is_not_found(self, mock_get_by):
-        mock_get_by.return_value = []
-        response = self._os_deployment_plans.get_by_name("test name")
-        self.assertEqual(response, None)
-
-    @mock.patch.object(ResourceHelper, 'get_all')
-    def test_get_by_name_called_once(self, mock_get_by):
-        self._os_deployment_plans.get_by_name("test name")
-        mock_get_by.assert_called_once_with(0, -1, filter='"name=\'test name\'"', query='', sort='')
diff --git a/tests/unit/resources/uncategorized/test_os_deployment_servers.py b/tests/unit/resources/uncategorized/test_os_deployment_servers.py
deleted file mode 100644
index 48a46ce2a..000000000
--- a/tests/unit/resources/uncategorized/test_os_deployment_servers.py
+++ /dev/null
@@ -1,205 +0,0 @@
-# -*- coding: utf-8 -*-
-###
-# (C) Copyright [2020] Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-from unittest import TestCase
-
-import mock
-
-from hpeOneView.connection import connection
-from hpeOneView.resources.resource import ResourceClient
-from hpeOneView.resources.uncategorized.os_deployment_servers import OsDeploymentServers
-
-
-class OsDeploymentServersTest(TestCase):
-    RESOURCE_ID = "81decf85-0dff-4a5e-8a95-52994eeb6493"
-    RESOURCE_URI = "/rest/os-deployment-servers/" + RESOURCE_ID
-
-    def setUp(self):
-        self.host = '127.0.0.1'
-        self.connection = connection(self.host, 800)
-        self._os_deployment_servers = OsDeploymentServers(self.connection)
-
-    @mock.patch.object(ResourceClient, 'get_all')
-    def test_get_all_called_once(self, mock_get_all):
-        filter = 'name=TestName'
-        sort = 'name:ascending'
-        fields = 'name'
-        view = 'expand'
-        query = 'query'
-
-        self._os_deployment_servers.get_all(2, 500, filter=filter, sort=sort, fields=fields, view=view, query=query)
-
-        mock_get_all.assert_called_once_with(2, 500, filter=filter, sort=sort, fields=fields, view=view, query=query)
-
-    @mock.patch.object(ResourceClient, 'get_all')
-    def test_get_all_called_once_with_default(self, mock_get_all):
-        self._os_deployment_servers.get_all()
-        mock_get_all.assert_called_once_with(0, -1, filter='', sort='', fields='', view='', query='')
-
-    @mock.patch.object(ResourceClient, 'get')
-    def test_get_by_id_called_once(self, mock_get):
-        self._os_deployment_servers.get(self.RESOURCE_ID)
-        mock_get.assert_called_once_with(self.RESOURCE_ID)
-
-    @mock.patch.object(ResourceClient, 'get')
-    def test_get_by_uri_called_once(self, mock_get):
-        self._os_deployment_servers.get(self.RESOURCE_URI)
-        mock_get.assert_called_once_with(self.RESOURCE_URI)
-
-    @mock.patch.object(ResourceClient, 'get_by')
-    def test_get_by_called_once(self, mock_get_by):
-        os_deployment_servers = [{'name': 'name1'}, {'name': 'name2'}]
-        mock_get_by.return_value = os_deployment_servers
-        result = self._os_deployment_servers.get_by("name", "test name")
-        mock_get_by.assert_called_once_with("name", "test name")
-        self.assertEqual(result, os_deployment_servers)
-
-    @mock.patch.object(ResourceClient, 'get_by')
-    def test_get_by_name_sould_return_none_when_resource_is_not_found(self, mock_get_by):
-        mock_get_by.return_value = []
-        response = self._os_deployment_servers.get_by_name("test name")
-        self.assertEqual(response, None)
-
-    @mock.patch.object(ResourceClient, 'get_by')
-    def test_get_by_name_called_once(self, mock_get_by):
-        os_deployment_servers = [{'name': 'test name', 'id': 1}, {'name': 'test name', 'id': 2}]
-        mock_get_by.return_value = os_deployment_servers
-        result = self._os_deployment_servers.get_by_name("test name")
-        mock_get_by.assert_called_once_with("name", "test name")
-        self.assertEqual(result, {'name': 'test name', 'id': 1})
-
-    @mock.patch.object(ResourceClient, 'create')
-    def test_add_called_once_with_defaults(self, mock_create):
-        os_deployment_server = {
-            "name": "DeploymentServer"
-        }
-        self._os_deployment_servers.add(os_deployment_server)
-        mock_create.assert_called_once_with(os_deployment_server, timeout=-1)
-
-    @mock.patch.object(ResourceClient, 'create')
-    def test_create_called_once(self, mock_create):
-        os_deployment_server = {
-            "name": "DeploymentServer"
-        }
-        self._os_deployment_servers.add(os_deployment_server, 70)
-        mock_create.assert_called_once_with(os_deployment_server, timeout=70)
-
-    @mock.patch.object(ResourceClient, 'update')
-    def test_update_called_once_with_defaults(self, update):
-        os_deployment_server = {
-            "id": "4b4b87e2-eea8-4c90-8eca-b92eaaeecfff",
-            "name": "DeploymentServer"
-        }
-        self._os_deployment_servers.update(os_deployment_server)
-        update.assert_called_once_with(os_deployment_server, force=False, timeout=-1)
-
-    @mock.patch.object(ResourceClient, 'update')
-    def test_update_called_once(self, mock_update):
-        os_deployment_server = {
-            "id": "4b4b87e2-eea8-4c90-8eca-b92eaaeecfff",
-            "name": "DeploymentServer"
-        }
-        self._os_deployment_servers.update(os_deployment_server, True, 70)
-        mock_update.assert_called_once_with(os_deployment_server, force=True, timeout=70)
-
-    @mock.patch.object(ResourceClient, 'delete')
-    def test_delete_called_once(self, mock_delete):
-        id = 'ad28cf21-8b15-4f92-bdcf-51cb2042db32'
-        self._os_deployment_servers.delete(id, force=True, timeout=50)
-
-        mock_delete.assert_called_once_with(id, force=True, timeout=50)
-
-    @mock.patch.object(ResourceClient, 'delete')
-    def test_delete_called_once_with_defaults(self, mock_delete):
-        id = 'ad28cf21-8b15-4f92-bdcf-51cb2042db32'
-        self._os_deployment_servers.delete(id)
-
-        mock_delete.assert_called_once_with(id, force=False, timeout=-1)
-
-    @mock.patch.object(ResourceClient, 'get')
-    def test_get_networks_called_once(self, mock_get):
-        networks = [{"name": "net1"}, {"name": "net2"}]
-        mock_get.return_value = networks
-        result = self._os_deployment_servers.get_networks()
-
-        mock_get.assert_called_once_with('/rest/deployment-servers/network')
-
-        self.assertEqual(result, networks)
-
-    @mock.patch.object(ResourceClient, 'get_all')
-    def test_get_appliances_called_once_with_defaults(self, mock_get_all):
-        appliances = [{"name": "app1"}, {"name": "app2"}]
-        mock_get_all.return_value = appliances
-        result = self._os_deployment_servers.get_appliances()
-
-        mock_get_all.assert_called_once_with(0, -1, filter='', fields='', query='', sort='',
-                                             uri='/rest/deployment-servers/image-streamer-appliances', view='')
-
-        self.assertEqual(result, appliances)
-
-    @mock.patch.object(ResourceClient, 'get_all')
-    def test_get_appliances_called_once(self, mock_get_all):
-        appliances = [{"name": "app1"}, {"name": "app2"}]
-        mock_get_all.return_value = appliances
-
-        result = self._os_deployment_servers.get_appliances(1, 10, filter='status=Connected', fields='name',
-                                                            query='teste <> name', sort='desc=name', view='expand')
-
-        self.assertEqual(result, appliances)
-        mock_get_all.assert_called_once_with(1, 10, filter='status=Connected', fields='name', query='teste <> name',
-                                             sort='desc=name', uri='/rest/deployment-servers/image-streamer-appliances',
-                                             view='expand')
-
-    @mock.patch.object(ResourceClient, 'get')
-    def test_get_appliance_called_once(self, mock_get):
-        appliance = {"name": "app1"}
-        mock_get.return_value = appliance
-        appliance_id = "123456"
-
-        result = self._os_deployment_servers.get_appliance(appliance_id)
-
-        mock_get.assert_called_once_with('/rest/deployment-servers/image-streamer-appliances/123456')
-        self.assertEqual(result, appliance)
-
-    @mock.patch.object(ResourceClient, 'get')
-    def test_get_appliance_called_once_with_fields(self, mock_get):
-        appliance = {"name": "app1"}
-        mock_get.return_value = appliance
-        appliance_id = "123456"
-
-        result = self._os_deployment_servers.get_appliance(appliance_id, fields='field')
-
-        mock_get.assert_called_once_with('/rest/deployment-servers/image-streamer-appliances/123456?fields=field')
-        self.assertEqual(result, appliance)
-
-    @mock.patch.object(ResourceClient, 'get_all')
-    def test_get_appliance_by_name_called_once(self, mock_get_all):
-        appliances = [{"name": "app1"}, {"name": "app2"}]
-        mock_get_all.return_value = appliances
-
-        result = self._os_deployment_servers.get_appliance_by_name("app2")
-
-        self.assertEqual(result, {"name": "app2"})
-
-    @mock.patch.object(ResourceClient, 'get_all')
-    def test_get_appliance_by_name_should_return_none_when_not_match(self, mock_get_all):
-        appliances = []
-        mock_get_all.return_value = appliances
-
-        result = self._os_deployment_servers.get_appliance_by_name("app2")
-
-        self.assertEqual(result, None)
diff --git a/tests/unit/test_oneview_client.py b/tests/unit/test_oneview_client.py
index 6dd973eff..a42b188de 100755
--- a/tests/unit/test_oneview_client.py
+++ b/tests/unit/test_oneview_client.py
@@ -66,8 +66,6 @@
 from hpeOneView.resources.networking.internal_link_sets import InternalLinkSets
 from hpeOneView.resources.search.index_resources import IndexResources
 from hpeOneView.resources.search.labels import Labels
-from hpeOneView.resources.uncategorized.os_deployment_plans import OsDeploymentPlans
-from hpeOneView.resources.uncategorized.os_deployment_servers import OsDeploymentServers
 from hpeOneView.resources.activity.alerts import Alerts
 from hpeOneView.resources.activity.events import Events
 from hpeOneView.resources.security.certificate_rabbitmq import CertificateRabbitMQ
@@ -106,7 +104,6 @@
 
 OS_ENVIRON_CONFIG_FULL = {
     'ONEVIEWSDK_IP': '172.16.100.199',
-    'ONEVIEWSDK_IMAGE_STREAMER_IP': '172.172.172.172',
     'ONEVIEWSDK_USERNAME': 'admin',
     'ONEVIEWSDK_PASSWORD': 'secret123',
     'ONEVIEWSDK_API_VERSION': '201',
@@ -117,7 +114,6 @@
 
 OS_ENVIRON_CONFIG_FULL_WITH_SESSIONID = {
     'ONEVIEWSDK_IP': '172.16.100.199',
-    'ONEVIEWSDK_IMAGE_STREAMER_IP': '172.172.172.172',
     'ONEVIEWSDK_USERNAME': 'admin',
     'ONEVIEWSDK_PASSWORD': 'secret123',
     'ONEVIEWSDK_SESSIONID': '123',
@@ -321,8 +317,6 @@ def test_from_full_environment_variables(self, mock_set_proxy, mock_login):
         mock_set_proxy.assert_called_once_with('172.16.100.195', 9999)
 
         self.assertEqual(201, oneview_client.connection._apiVersion)
-        self.assertEqual(oneview_client.create_image_streamer_client().connection.get_host(),
-                         OS_ENVIRON_CONFIG_FULL['ONEVIEWSDK_IMAGE_STREAMER_IP'])
 
     @mock.patch.object(connection, 'login')
     @mock.patch.object(connection, 'set_proxy')
@@ -337,8 +331,6 @@ def test_from_full_environment_variables_with_sessionID(self, mock_set_proxy, mo
         mock_set_proxy.assert_called_once_with('172.16.100.195', 9999)
 
         self.assertEqual(201, oneview_client.connection._apiVersion)
-        self.assertEqual(oneview_client.create_image_streamer_client().connection.get_host(),
-                         OS_ENVIRON_CONFIG_FULL_WITH_SESSIONID['ONEVIEWSDK_IMAGE_STREAMER_IP'])
 
     @mock.patch.dict('os.environ', OS_ENVIRON_CONFIG_FULL)
     @mock.patch.object(OneViewClient, '__init__')
@@ -350,7 +342,6 @@ def test_from_environment_variables_is_passing_right_arguments_to_the_constructo
                                           'timeout': '20',
                                           'ip': '172.16.100.199',
                                           'ssl_certificate': '',
-                                          'image_streamer_ip': '172.172.172.172',
                                           'credentials':
                                               {'userName': 'admin',
                                                'password': 'secret123',
@@ -366,7 +357,6 @@ def test_from_environment_variables_is_passing_right_arguments_to_the_constructo
                                           'proxy': '172.16.100.195:9999',
                                           'timeout': '20',
                                           'ip': '172.16.100.199',
-                                          'image_streamer_ip': '172.172.172.172',
                                           'ssl_certificate': '',
                                           'credentials':
                                               {'userName': 'admin',
@@ -383,7 +373,6 @@ def test_from_environment_variables_is_passing_right_arguments_to_the_constructo
                                           'proxy': '',
                                           'timeout': None,
                                           'ip': '172.16.100.199',
-                                          'image_streamer_ip': '',
                                           'ssl_certificate': '',
                                           'credentials':
                                               {'userName': '',
@@ -391,43 +380,6 @@ def test_from_environment_variables_is_passing_right_arguments_to_the_constructo
                                                'authLoginDomain': '',
                                                'sessionID': '123'}})
 
-    @mock.patch.object(connection, 'login')
-    def test_create_image_streamer_client_without_image_streamer_ip(self, mock_login):
-
-        config = {"ip": "172.16.102.59",
-                  "api_version": 800,
-                  "credentials": {
-                      "userName": "administrator",
-                      "password": "password"}}
-
-        client = OneViewClient(config)
-        client.connection.set_session_id('123')
-
-        try:
-            client.create_image_streamer_client()
-        except ValueError as e:
-            self.assertTrue("Image streamer ip" in e.args[0])
-
-    @mock.patch.object(connection, 'login')
-    def test_create_image_streamer_client_with_image_streamer_ip(self, mock_login):
-
-        config = {"ip": "172.16.102.59",
-                  "image_streamer_ip": "172.16.102.50",
-                  "api_version": 800,
-                  "credentials": {
-                      "userName": "administrator",
-                      "password": "password"}}
-
-        client = OneViewClient(config)
-        client.connection.set_session_id('124')
-
-        i3s = client.create_image_streamer_client()
-
-        self.assertEqual(i3s.connection.get_session_id(), client.connection.get_session_id())
-        self.assertEqual(i3s.connection._apiVersion, client.api_version)
-        self.assertEqual(i3s.connection.get_host(), "172.16.102.50")
-        self.assertEqual(client.connection.get_host(), "172.16.102.59")
-
     def test_fc_networks_has_right_type(self):
         self.assertIsInstance(self._oneview.fc_networks, FcNetworks)
 
@@ -911,20 +863,6 @@ def test_lazy_loading_events(self):
         events = self._oneview.events
         self.assertEqual(events, self._oneview.events)
 
-    def test_os_deployment_plans_has_right_type(self):
-        self.assertIsInstance(self._oneview.os_deployment_plans, OsDeploymentPlans)
-
-    def test_os_deployment_plans_return(self):
-        self.assertNotEqual(self._oneview.os_deployment_plans,
-                            self._oneview.os_deployment_plans)
-
-    def test_os_deployment_servers_has_right_type(self):
-        self.assertIsInstance(self._oneview.os_deployment_servers, OsDeploymentServers)
-
-    def test_lazy_loading_os_deployment_servers(self):
-        os_deployment_servers = self._oneview.os_deployment_servers
-        self.assertEqual(os_deployment_servers, self._oneview.os_deployment_servers)
-
     def test_certificate_rabbitmq_has_right_type(self):
         self.assertIsInstance(self._oneview.certificate_rabbitmq, CertificateRabbitMQ)