Bump version to 0.9.8.11

* Add support for UCS X-Direct in UCSM config/inventory/report * Add support for assigning user label to devices * Add GUI support for Intersight SaaS/Appliance and SaaS regions * Renamed clear_intersight_claim_status action to reset_device_connector * Bump up minimum Intersight Appliance required version to 1.1.0-1 * Miscellaneous bug fixes and improvements
vesposito · Sep 3, 2024 · d60501f · d60501f
1 parent aa2f391
commit d60501f
Show file tree

Hide file tree

Showing 67 changed files with 3,300 additions and 1,143 deletions.
diff --git a/README.md b/README.md
@@ -76,6 +76,15 @@ python -m pip install -r requirements.txt
 EasyUCS can be used with command line interface or via a Web GUI.
 
 
+### Using the Web Graphical User Interface (GUI) / the API
+
+The Web GUI is hosted by your machine, in order to launch it you need to use the file **[easyucs_api.py](./easyucs_api.py)**.
+
+```
+python easyucs_api.py
+```
+
+
 ### Using the Command-Line Interface (CLI)
 
 Push config file config_ucsm.json to UCS system
@@ -128,17 +137,9 @@ Clear SEL Logs of all discovered servers of UCS system
 python easyucs.py device clear_sel_logs -t ucsm -i 192.168.0.1 -u admin -p password
 ```
 
-Clear Intersight Device Connector claim status for UCS system
+Reset Device Connector for UCS system
 ```
-python easyucs.py device clear_intersight_claim_status -t ucsm -i 192.168.0.1 -u admin -p password
-```
-
-#### Using the Web Graphical User Interface (GUI) / the API
-
-The Web GUI is hosted by your machine, in order to launch it you need to use the file **[easyucs_api.py](./easyucs_api.py)**.
-
-```
-python easyucs_api.py
+python easyucs.py device reset_device_connector -t ucsm -i 192.168.0.1 -u admin -p password
 ```
 
 
@@ -152,6 +153,14 @@ python easyucs_api.py
 
 ## Versioning
 
+### 0.9.8.11
+* Add support for UCS X-Direct in UCSM config/inventory/report
+* Add support for assigning user label to devices
+* Add GUI support for Intersight SaaS/Appliance and SaaS regions
+* Renamed clear_intersight_claim_status action to reset_device_connector
+* Bump up minimum Intersight Appliance required version to 1.1.0-1
+* Miscellaneous bug fixes and improvements
+
 ### 0.9.8.10
 
 * Add support for a new Software Repository feature in EasyUCS UI, with ability to serve as an HTTP repo for ISO/firmware updates
@@ -246,7 +255,7 @@ This also means that there are a few **breaking changes** in the JSON format for
 
 * Add support for Intersight Device Connector in inventory & config for UCSM & IMC
 * Add Device Connector section in UCSM & IMC report
-* Add support for clearing Intersight Claim Status for UCSM & IMC Device Connector
+* Add support for resetting UCSM & IMC Device Connector
 * Miscellaneous bug fixes
 
 ### 0.9.7
@@ -330,13 +339,13 @@ Initial release
 
 ## Authors
 
-* **Marc Abu El Ghait** - *Initial work* - [github account link](https://github.com/mabuelgh)
-* **Franck Bonneau** - *Initial work* - [github account link](https://github.com/Franck-Bonneau)
-* **Vincent Esposito** - *Initial work* - [github account link](https://github.com/vesposito)
+* **Marc Abu El Ghait** - *Initial work* - [GitHub account link](https://github.com/mabuelgh)
+* **Franck Bonneau** - *Initial work* - [GitHub account link](https://github.com/Franck-Bonneau)
+* **Vincent Esposito** - *Initial work* - [GitHub account link](https://github.com/vesposito)
 
 ## Contributors
-* **Shashank Pandey** - *Repository, DB, API, Intersight, ...* - [github account link](https://github.com/Shashank-Pandey-ML)
-* **Valentin Pereira** - *Redesigned GUI* - [github account link](https://github.com/Valisback)
+* **Shashank Pandey** - *Repository, DB, API, Intersight, ...* - [GitHub account link](https://github.com/Shashank-Pandey-ML)
+* **Valentin Pereira** - *Redesigned GUI* - [GitHub account link](https://github.com/Valisback)
 * **Mohamed Ismayil** - *Intersight support*
 * **Syeda Mehar Naseer** - *UCS Central/Manager & Intersight support*
 * **Anjana Devi Chilukuri** - *UCS Central/Manager & Intersight support*

diff --git a/__init__.py b/__init__.py
@@ -3,7 +3,7 @@
 __author__ = "Marc Abu El Ghait, Franck Bonneau and Vincent Esposito"
 __copyright__ = "Copyright 2016-2024, Cisco"
 
-__version__ = "0.9.8.10"
+__version__ = "0.9.8.11"
 __status__ = "Development"
 
 # https://realpython.com/pypi-publish-python-package/

diff --git a/api/api_server.py b/api/api_server.py
diff --git a/api/specs/devices_actions_clear_intersight_claim_status.json b/api/specs/devices_actions_clear_intersight_claim_status.json
diff --git a/api/specs/devices_actions_reset_device_connector.json b/api/specs/devices_actions_reset_device_connector.json
@@ -0,0 +1,3 @@
+{
+   "$ref": "easyucs.json#/components/schemas/devices_actions_reset_device_connector_post"
+}
diff --git a/api/specs/easyucs.json b/api/specs/easyucs.json
@@ -1,7 +1,7 @@
 {
   "openapi": "3.0.3",
   "info": {
-    "version": "0.9.8.10",
+    "version": "0.9.8.11",
     "title": "EasyUCS API",
     "description": "Description of EasyUCS API"
   },
@@ -79,11 +79,6 @@
         ],
         "example": "cvd"
       },
-      "clear_intersight_claim_status": {
-        "type": "boolean",
-        "description": "Clear Intersight claim status if claimed",
-        "example": true
-      },
       "clear_sel_logs": {
         "type": "boolean",
         "description": "Clear SEL logs from all servers",
@@ -532,6 +527,11 @@
         "description": "UUID of the report",
         "example": "783670e4-c03c-40a8-89cf-2eb9eacc2c6a"
       },
+      "reset_device_connector": {
+        "type": "boolean",
+        "description": "Reset Device Connector",
+        "example": true
+      },
       "restore_repo": {
         "type": "boolean",
         "description": "Whether to restore repofiles and reposynctodevice tables",
@@ -812,14 +812,14 @@
           "description": "Action",
           "example": "reset",
           "enum": [
-            "clear_intersight_claim_status",
             "clear_sel_logs",
             "clear_user_sessions",
             "decommission_all_rack_servers",
             "erase_all_virtual_drives",
             "erase_all_flexflash",
             "regenerate_certificate",
             "reset",
+            "reset_device_connector",
             "set_all_drives_status"
           ]
         }
@@ -1324,9 +1324,6 @@
           "password": {
             "$ref": "#/components/schemas/password"
           },
-          "clear_intersight_claim_status": {
-            "$ref": "#/components/schemas/clear_intersight_claim_status"
-          },
           "clear_sel_logs": {
             "$ref": "#/components/schemas/clear_sel_logs"
           },
@@ -1339,6 +1336,9 @@
           "erase_virtual_drives": {
             "$ref": "#/components/schemas/erase_virtual_drives"
           },
+          "reset_device_connector": {
+            "$ref": "#/components/schemas/reset_device_connector"
+          },
           "unregister_from_central": {
             "$ref": "#/components/schemas/unregister_from_central"
           }
@@ -1370,7 +1370,7 @@
         },
         "additionalProperties": false
       },
-      "devices_actions_clear_intersight_claim_status_post": {
+      "devices_actions_delete_post": {
         "type": "object",
         "required": [
           "device_uuids"
@@ -1385,7 +1385,7 @@
         },
         "additionalProperties": false
       },
-      "devices_actions_delete_post": {
+      "devices_actions_reset_device_connector_post": {
         "type": "object",
         "required": [
           "device_uuids"
@@ -2204,7 +2204,7 @@
       "restore_repo": {
         "name": "restore_repo",
         "in": "query",
-        "description": "Whether to resore repofiles and reposynctodevice tables",
+        "description": "Whether to restore repofiles and reposynctodevice tables",
         "schema": {
           "$ref": "#/components/schemas/restore_repo"
         }
@@ -2705,42 +2705,26 @@
         }
       }
     },
-    "/devices/actions/clear_intersight_claim_status": {
+    "/devices/actions/delete": {
       "post": {
         "tags": [
           "devices"
         ],
-        "summary": "Clears the Intersight Claim Status of a list of devices",
-        "description": "Clears the Intersight Claim Status of a list of devices in EasyUCS.",
+        "summary": "Deletes a list of devices",
+        "description": "Deletes a list of devices in EasyUCS.",
         "requestBody": {
           "required": true,
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/devices_actions_clear_intersight_claim_status_post"
+                "$ref": "#/components/schemas/devices_actions_delete_post"
               }
             }
           }
         },
         "responses": {
           "200": {
-            "description": "A list of task UUIDs",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {
-                    "tasks": {
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/components/schemas/task_uuid"
-                      }
-                    }
-                  },
-                  "additionalProperties": false
-                }
-              }
-            }
+            "description": "Devices successfully deleted"
           },
           "400": {
             "$ref": "#/components/responses/400ClientError"
@@ -2751,26 +2735,42 @@
         }
       }
     },
-    "/devices/actions/delete": {
+    "/devices/actions/reset_device_connector": {
       "post": {
         "tags": [
           "devices"
         ],
-        "summary": "Deletes a list of devices",
-        "description": "Deletes a list of devices in EasyUCS.",
+        "summary": "Resets the Device Connector of a list of devices",
+        "description": "Resets the Device Connector of a list of devices in EasyUCS.",
         "requestBody": {
           "required": true,
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/devices_actions_delete_post"
+                "$ref": "#/components/schemas/devices_actions_reset_device_connector_post"
               }
             }
           }
         },
         "responses": {
           "200": {
-            "description": "Devices successfully deleted"
+            "description": "A list of task UUIDs",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "tasks": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/task_uuid"
+                      }
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              }
+            }
           },
           "400": {
             "$ref": "#/components/responses/400ClientError"
@@ -3006,47 +3006,6 @@
         }
       }
     },
-    "/devices/{device_uuid}/actions/clear_intersight_claim_status": {
-      "post": {
-        "tags": [
-          "devices"
-        ],
-        "summary": "Clears Intersight Claim Status of given UCS device",
-        "description": "Clears Intersight Claim Status of given UCS device",
-        "parameters": [
-          {
-            "$ref": "#/components/parameters/device_uuid"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The corresponding task to follow progress",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {
-                    "task": {
-                      "$ref": "#/components/schemas/task_uuid"
-                    }
-                  },
-                  "additionalProperties": false
-                }
-              }
-            }
-          },
-          "400": {
-            "$ref": "#/components/responses/400ClientError"
-          },
-          "404": {
-            "$ref": "#/components/responses/404NotFound"
-          },
-          "500": {
-            "$ref": "#/components/responses/500ServerError"
-          }
-        }
-      }
-    },
     "/devices/{device_uuid}/actions/clear_config": {
       "post": {
         "tags": [
@@ -3284,6 +3243,47 @@
         }
       }
     },
+    "/devices/{device_uuid}/actions/reset_device_connector": {
+      "post": {
+        "tags": [
+          "devices"
+        ],
+        "summary": "Resets Device Connector of given UCS device",
+        "description": "Resets Device Connector of given UCS device",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/device_uuid"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The corresponding task to follow progress",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "task": {
+                      "$ref": "#/components/schemas/task_uuid"
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "$ref": "#/components/responses/400ClientError"
+          },
+          "404": {
+            "$ref": "#/components/responses/404NotFound"
+          },
+          "500": {
+            "$ref": "#/components/responses/500ServerError"
+          }
+        }
+      }
+    },
     "/devices/{device_uuid}/actions/test_connection": {
       "post": {
         "tags": [