pyghmi 1.6.4__py3-none-any.whl → 1.6.5__py3-none-any.whl

pyghmi/redfish/command.py

@@ -445,7 +445,7 @@ class Command(object):
         return self.oem.get_ikvm_launchdata()
 
     def user_delete(self, uid):
-        self.oem.user_delete(uid)
+        self.oem.user_delete(uid, self)
 
     def set_user_name(self, uid, name):
         """Set user name

pyghmi/redfish/oem/generic.py

@@ -383,13 +383,19 @@ class OEMHandler(object):
             summary['badreadings'].append(unkinf)
         return summary
 
-    def user_delete(self, uid):
+    def user_delete(self, uid, fishclient):
         # Redfish doesn't do so well with Deleting users either...
         # Blanking the username seems to be the convention
         # First, set a bogus password in case the implementation does honor
         # blank user, at least render such an account harmless
-        self.set_user_password(uid, base64.b64encode(os.urandom(15)))
-        self.set_user_name(uid, '')
+        try:
+            accinfo = fishclient._account_url_info_by_id(uid)
+            if not accinfo:
+                raise Exception("No such account found")
+            self._do_web_request(accinfo[0], method='DELETE')
+        except Exception: # fall back to old ipmi-like behavior for such implementations
+            fishclient.set_user_password(uid, base64.b64encode(os.urandom(15)))
+            fishclient.set_user_name(uid, '')
         return True
 
     def set_bootdev(self, bootdev, persist=False, uefiboot=None,

pyghmi/redfish/oem/lenovo/xcc.py

@@ -1662,7 +1662,7 @@ class OEMHandler(generic.OEMHandler):
                     license_errors[rsp['return']])
         return self.get_licenses(fishclient)
 
-    def user_delete(self, uid):
+    def user_delete(self, uid, fishclient=None):
         userinfo = self.wc.grab_json_response('/api/dataset/imm_users')
         uidtonamemap = {}
         for user in userinfo.get('items', [{'users': []}])[0].get('users', []):

{pyghmi-1.6.4.dist-info → pyghmi-1.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyghmi
-Version: 1.6.4
+Version: 1.6.5
 Summary: Python General Hardware Management Initiative (IPMI and others)
 Home-page: http://github.com/openstack/pyghmi/
 Author: Jarrod Johnson

{pyghmi-1.6.4.dist-info → pyghmi-1.6.5.dist-info}/RECORD

@@ -43,9 +43,9 @@ pyghmi/ipmi/private/simplesession.py,sha256=cNGaoT0uWIKDut6gUG9kAOX_b_qTzdB26R6I
 pyghmi/ipmi/private/spd.py,sha256=oEPSXm19X2eNXDiyW_6fVjBFqhuuMAtBI9quRJgclH4,27094
 pyghmi/ipmi/private/util.py,sha256=ayYodiSydlrrt0_pQppoRB1T6n-KNOiHZSfAlCMcpG0,3847
 pyghmi/redfish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyghmi/redfish/command.py,sha256=_HLICBri_ON1GqSqqPNWoNKnGz7YBrqHo_l6tjGRiDc,61350
+pyghmi/redfish/command.py,sha256=XoXSNgnYEanPFGaf6VPdLbGk6EIeep1eK3ouDDG0Nl0,61356
 pyghmi/redfish/oem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyghmi/redfish/oem/generic.py,sha256=fX6ADqGURX9cQr-Q8cyncQtxLM1oz5CMv57IQ8ijxoY,57313
+pyghmi/redfish/oem/generic.py,sha256=KPivHBUL_eliAT4xI8fLgS7LbF-1mH_BpkMKFRoN1Fo,57656
 pyghmi/redfish/oem/lookup.py,sha256=pfJW5xSkUY61OirMeYy0b1SbjBFz6IDfN5ZOYog_Yq4,1530
 pyghmi/redfish/oem/dell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyghmi/redfish/oem/dell/idrac.py,sha256=pNnmqdV1sOP3ABw0xq0wF1QEO2L8onT7Osc_-sDO8EU,2146
@@ -54,7 +54,7 @@ pyghmi/redfish/oem/lenovo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 pyghmi/redfish/oem/lenovo/main.py,sha256=bnx8LuC_C4_OluNR8JSHIxtSlM4_jdBb4cUzJM6mazE,2597
 pyghmi/redfish/oem/lenovo/smm3.py,sha256=QHasf5QofFuYqtHPeqcwCEJUbd0PV5_C6u-Y8FVdqCk,7598
 pyghmi/redfish/oem/lenovo/tsma.py,sha256=6GELCuriumARj_kv7fgqtUpo9ekiWHpQcM9v_mnGILI,34645
-pyghmi/redfish/oem/lenovo/xcc.py,sha256=78ksNj2-0jquj61lmAZldy3DdcR5KndqbLQ2Y4ZSFOM,84234
+pyghmi/redfish/oem/lenovo/xcc.py,sha256=ydUn4mwyHcgWKmoDY66O_EVuUo43-Oy7JU8Y_6Km4kA,84251
 pyghmi/redfish/oem/lenovo/xcc3.py,sha256=8LxWzqXCkNmQ9PT-bu2ZSvgziTar3u1J37x8IRBshx8,55843
 pyghmi/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyghmi/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -64,11 +64,11 @@ pyghmi/tests/unit/ipmi/test_sdr.py,sha256=vb3iLY0cnHJ2K_m4xgYUjEcbPd_ZYhYx-uBowB
 pyghmi/util/__init__.py,sha256=GZLBWJiun2Plb_VE9dDSh4_PQMCha3gA7QLUqx3oSYI,25
 pyghmi/util/parse.py,sha256=6VlyBCEcE8gy8PJWmEDdtCyWATaKwPaTswCdioPCWOE,2120
 pyghmi/util/webclient.py,sha256=i1rJ7NBlPQFTRv7kgzbTaOHsWuPeXcMAjRXm_i8CI0A,15652
-pyghmi-1.6.4.dist-info/AUTHORS,sha256=yv4aQom_PII-SNqbeeKrfH-spcG85PRPsZ71Iqjl_fU,2083
-pyghmi-1.6.4.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-pyghmi-1.6.4.dist-info/METADATA,sha256=iunjBkI12heq3smej-gMbCPO3KdWK4Y60I6yuxqmwd0,1136
-pyghmi-1.6.4.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-pyghmi-1.6.4.dist-info/entry_points.txt,sha256=-OpJliDzATxmuPXK0VR3Ma-Yk_i4ZhfIIB-12A26dSI,168
-pyghmi-1.6.4.dist-info/pbr.json,sha256=G84aunNCSzzeuUMkVxkxXAfI8E9qATe2tf_kPWkiFWs,46
-pyghmi-1.6.4.dist-info/top_level.txt,sha256=aDtt6S9eVu6-tNdaUs4Pz9PbdUd69bziZZMhNvk9Ulc,7
-pyghmi-1.6.4.dist-info/RECORD,,
+pyghmi-1.6.5.dist-info/AUTHORS,sha256=yv4aQom_PII-SNqbeeKrfH-spcG85PRPsZ71Iqjl_fU,2083
+pyghmi-1.6.5.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+pyghmi-1.6.5.dist-info/METADATA,sha256=NwQSpwKaIXyG_7u6DZLjy06x0Xkcao9oV8XcGLNT6HM,1136
+pyghmi-1.6.5.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+pyghmi-1.6.5.dist-info/entry_points.txt,sha256=-OpJliDzATxmuPXK0VR3Ma-Yk_i4ZhfIIB-12A26dSI,168
+pyghmi-1.6.5.dist-info/pbr.json,sha256=r8aaroFMObDxmIIa6_e_w9lYyPvv1WHskqCleNGcnY0,46
+pyghmi-1.6.5.dist-info/top_level.txt,sha256=aDtt6S9eVu6-tNdaUs4Pz9PbdUd69bziZZMhNvk9Ulc,7
+pyghmi-1.6.5.dist-info/RECORD,,

pyghmi-1.6.5.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "f56e000", "is_release": true}

pyghmi-1.6.4.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "99af22b", "is_release": true}