From 6cc1c5b4035cda4d9835a3ed0dc09b1f0599b30a Mon Sep 17 00:00:00 2001 From: Chebrolu Harika Date: Fri, 8 May 2020 15:37:42 +0530 Subject: [PATCH 1/7] API1600 Support for LogicalEnclosures --- CHANGELOG.md | 1 + endpoints-support.md | 22 +++++++++++----------- examples/logical_enclosures.py | 16 +++++++++------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42fe81fa1..7b8cfa6d0 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ Extends support of the SDK to OneView REST API version 1600 (OneView v5.20). - Hypervisor Managers - Interconnects - Interconnect Types +- Logical Enclosures - Logical Interconnects - Logical Interconnect Groups - Server Hardware diff --git a/endpoints-support.md b/endpoints-support.md index 495d0cf28..06e1d8725 100755 --- a/endpoints-support.md +++ b/endpoints-support.md @@ -115,17 +115,17 @@ |/rest/internal-link-sets | GET | :white_check_mark: | :white_check_mark: | :white_check_mark: | |/rest/internal-link-sets/{id} | GET | :white_check_mark: | :white_check_mark: | :white_check_mark: | | **Logical Enclosures** -|/rest/logical-enclosures | GET | :white_check_mark: | :white_check_mark: | :white_check_mark: | -|/rest/logical-enclosures | POST | :white_check_mark: | :white_check_mark: | :white_check_mark: | -|/rest/logical-enclosures/{id} | GET | :white_check_mark: | :white_check_mark: | :white_check_mark: | -|/rest/logical-enclosures/{id} | PUT | :white_check_mark: | :white_check_mark: | :white_check_mark: | -|/rest/logical-enclosures/{id} | PATCH | :white_check_mark: | :white_check_mark: | :white_check_mark: | -|/rest/logical-enclosures/{id} | DELETE | :white_check_mark: | :white_check_mark: | :white_check_mark: | -|/rest/logical-enclosures/{id}/configuration | PUT | :white_check_mark: | :white_check_mark: | :white_check_mark: | -|/rest/logical-enclosures/{id}/script | GET | :white_check_mark: | :white_check_mark: | :white_check_mark: | -|/rest/logical-enclosures/{id}/script | PUT | :white_check_mark: | :white_check_mark: | :white_check_mark: | -|/rest/logical-enclosures/{id}/support-dumps | POST | :white_check_mark: | :white_check_mark: | :white_check_mark: | -|/rest/logical-enclosures/{id}/updateFromGroup | PUT | :white_check_mark: | :white_check_mark: | :white_check_mark: | +|/rest/logical-enclosures | GET | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | +|/rest/logical-enclosures | POST | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | +|/rest/logical-enclosures/{id} | GET | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | +|/rest/logical-enclosures/{id} | PUT | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | +|/rest/logical-enclosures/{id} | PATCH | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | +|/rest/logical-enclosures/{id} | DELETE | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | +|/rest/logical-enclosures/{id}/configuration | PUT | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | +|/rest/logical-enclosures/{id}/script | GET | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: | +|/rest/logical-enclosures/{id}/script | PUT | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: | +|/rest/logical-enclosures/{id}/support-dumps | POST | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | +|/rest/logical-enclosures/{id}/updateFromGroup | PUT | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | **Logical Interconnect Groups** |/rest/logical-interconnect-groups | GET | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | |/rest/logical-interconnect-groups | POST | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | diff --git a/examples/logical_enclosures.py b/examples/logical_enclosures.py index 7c6e4bc27..aa5b21e8a 100644 --- a/examples/logical_enclosures.py +++ b/examples/logical_enclosures.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ### -# (C) Copyright [2019] Hewlett Packard Enterprise Development LP +# (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. @@ -119,12 +119,14 @@ print(" Done.") # Update and get script -print("Update script") -script = "# TEST COMMAND" -logical_enclosure_updated = logical_enclosure.update_script( - logical_enclosure.data['uri'], script) -print(" updated script: '{}'".format( - logical_enclosure.get_script())) +# This method is available for API version 300 +if oneview_client.api_version == 300: + print("Update script") + script = "# TEST COMMAND" +l ogical_enclosure_updated = logical_enclosure.update_script( + logical_enclosure.data['uri'], script) + print(" updated script: '{}'".format( + logical_enclosure.get_script())) # Create support dumps print("Generate support dump") From 4767545e9dd5034e11a051699f01db249677c13f Mon Sep 17 00:00:00 2001 From: Chebrolu Harika Date: Fri, 8 May 2020 18:29:35 +0530 Subject: [PATCH 2/7] fix in LE example --- examples/logical_enclosures.py | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/logical_enclosures.py b/examples/logical_enclosures.py index aa5b21e8a..01212b2ca 100644 --- a/examples/logical_enclosures.py +++ b/examples/logical_enclosures.py @@ -107,6 +107,7 @@ (logical_enclosure.data['uri'], logical_enclosure.data['name'])) print("Reset name") +resource = logical_enclosure.data.copy() resource["name"] = previous_name logical_enclosure.update(resource) print(" Done. uri: '%s', 'name': '%s'" % From 016a6e7f668301554f70b0159009999800d15a1a Mon Sep 17 00:00:00 2001 From: Chebrolu Harika Date: Fri, 8 May 2020 18:32:45 +0530 Subject: [PATCH 3/7] fix flake issues --- examples/logical_enclosures.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/examples/logical_enclosures.py b/examples/logical_enclosures.py index 01212b2ca..c73028dc6 100644 --- a/examples/logical_enclosures.py +++ b/examples/logical_enclosures.py @@ -124,10 +124,8 @@ if oneview_client.api_version == 300: print("Update script") script = "# TEST COMMAND" -l ogical_enclosure_updated = logical_enclosure.update_script( - logical_enclosure.data['uri'], script) - print(" updated script: '{}'".format( - logical_enclosure.get_script())) + logical_enclosure_updated = logical_enclosure.update_script(logical_enclosure.data['uri'], script) + print(" updated script: '{}'".format(logical_enclosure.get_script())) # Create support dumps print("Generate support dump") From 82acafddb79d2d32ea3800a4957fcd7b1bdc7162 Mon Sep 17 00:00:00 2001 From: Chebrolu Bala Sai Harika <34155580+chebroluharika@users.noreply.github.com> Date: Wed, 13 May 2020 16:26:55 +0530 Subject: [PATCH 4/7] check build issue --- examples/logical_enclosures.py | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/logical_enclosures.py b/examples/logical_enclosures.py index c73028dc6..996c35f97 100644 --- a/examples/logical_enclosures.py +++ b/examples/logical_enclosures.py @@ -22,6 +22,7 @@ config = { "ip": "", + "api_version": "" "credentials": { "userName": "", "password": "" From ff0f259e9cfdb14bdf81fdfc02c340f8026bcf3b Mon Sep 17 00:00:00 2001 From: Chebrolu Bala Sai Harika <34155580+chebroluharika@users.noreply.github.com> Date: Wed, 13 May 2020 16:30:45 +0530 Subject: [PATCH 5/7] check build --- examples/logical_enclosures.py | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/logical_enclosures.py b/examples/logical_enclosures.py index 996c35f97..c73028dc6 100644 --- a/examples/logical_enclosures.py +++ b/examples/logical_enclosures.py @@ -22,7 +22,6 @@ config = { "ip": "", - "api_version": "" "credentials": { "userName": "", "password": "" From ea9cd9f8995af7b1c5f8ba6e21dddfb9ea84d48c Mon Sep 17 00:00:00 2001 From: Chebrolu Bala Sai Harika <34155580+chebroluharika@users.noreply.github.com> Date: Thu, 14 May 2020 09:32:25 +0530 Subject: [PATCH 6/7] Update logical_enclosures.py --- examples/logical_enclosures.py | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/logical_enclosures.py b/examples/logical_enclosures.py index c73028dc6..996c35f97 100644 --- a/examples/logical_enclosures.py +++ b/examples/logical_enclosures.py @@ -22,6 +22,7 @@ config = { "ip": "", + "api_version": "" "credentials": { "userName": "", "password": "" From c1e83c1be512c0178e4865862422f3fd2ae04a04 Mon Sep 17 00:00:00 2001 From: Chebrolu Bala Sai Harika <34155580+chebroluharika@users.noreply.github.com> Date: Thu, 14 May 2020 09:35:01 +0530 Subject: [PATCH 7/7] Update logical_enclosures.py --- examples/logical_enclosures.py | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/logical_enclosures.py b/examples/logical_enclosures.py index 996c35f97..c73028dc6 100644 --- a/examples/logical_enclosures.py +++ b/examples/logical_enclosures.py @@ -22,7 +22,6 @@ config = { "ip": "", - "api_version": "" "credentials": { "userName": "", "password": ""