updatec to latest 2.0 version

Author: Jack Garcia

README.rst

@@ -137,6 +137,8 @@ History
   * 12/06/2016: Release of v1.6.0
   * 01/17/2017: Release of v1.7.0
   * 02/01/2017: Release of v1.8.0
+  * 03/22/2017: Release of v1.9.0
+  * 04/12/2017: Release of v1.9.1
 
 Copyright and License
 ---------------------

docs/Installation-Guide.rest

@@ -103,13 +103,13 @@ Execute the following command from the directory where you want to copy the sour
 Building and installing HP REST library
 ===================================
 
-First download the redfish.zip file from the github. Next unzip redfish.zip file to redfish directory and from the command prompt go to the directory. Execute the following commands in order to install redfish (assuming the version is 1.9.2).
+First download the redfish.zip file from the github. Next unzip redfish.zip file to redfish directory and from the command prompt go to the directory. Execute the following commands in order to install redfish (assuming the version is 2.0.0).
 
 ::
 
   python setup.py sdist --formats=zip
   cd dist
-  pip install --upgrade python-ilorest-library-1.9.2.zip
+  pip install --upgrade python-ilorest-library-2.0.0.zip
 
 ::
 

docs/conf.py

@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.9.2'
+version = u'2.0.0'
 # The full version, including alpha/beta/rc tags.
-release = u'1.9.2'
+release = u'2.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

makeandinstallzip.bat

@@ -1,3 +1,3 @@
 python setup.py sdist --formats=zip
 cd dist
-pip install --upgrade python-ilorest-library-1.9.2.zip
+pip install --upgrade python-ilorest-library-2.0.0.zip

setup.cfg

@@ -7,4 +7,4 @@ requires = jsonpatch >= 1.3
 	jsonpointer >= 1.1
 	urlparse2 >= 1.1.1
 	validictory >= 1.0.1
-	ilorest_chif >= 1.9.2
+	ilorest_chif >= 2.0.0

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 setup(name='python-ilorest-library',
-      version='1.9.2',
+      version='2.0.0',
       description='iLO Rest Python Library',
 	  author = 'Hewlett Packard Enterprise',
 	  author_email = 'jackgarcia77@gmail.com',

src/redfish/hpilo/risblobstore2.py

@@ -79,6 +79,10 @@ class Blob2ListError(Exception):
     """Raised when list operation fails"""
     pass
 
+class Blob2SecurityError(Exception):
+    """Raised when list operation fails"""
+    pass
+
 class BlobNotFoundError(Exception):
     """Raised when blob not found in key/namespace"""
     pass
@@ -87,6 +91,10 @@ class ChifDllMissingError(Exception):
     """Raised when unable to obtain ilorest_chif dll handle"""
     pass
 
+class EncryptionEnabledError(Exception):
+    """Raised when high security encryption is enabled"""
+    pass
+
 #----------------------------------------------------------
 
 #-------------------Helper functions-------------------------
@@ -152,6 +160,43 @@ def create(self, key, namespace):
 
         return resp
 
+    def createbc(self, key, namespace):
+        """Create the blob
+
+        :param key: The blob key to create.
+        :type key: str.
+        :param namespace: The blob namespace to create the key in.
+        :type namespace: str.
+
+        """
+        lib = self.gethprestchifhandle()
+        lib.create_not_blobentrybc.argtypes = [c_char_p, c_char_p]
+        lib.create_not_blobentrybc.restype = POINTER(c_ubyte)
+
+        name = create_string_buffer(key)
+        namespace = create_string_buffer(namespace)
+
+        ptr = lib.create_not_blobentrybc(name, namespace)
+        data = ptr[:lib.size_of_srbuf()]
+        data = bytearray(data)
+
+        resp = self._send_receive_raw(data, lib.size_of_srbuf())
+
+        if len(resp) > lib.size_of_srbuf():
+            raise Blob2CreateError("create response larger than expected")
+
+        if len(resp) < lib.size_of_srbuf():
+            raise Blob2CreateError("create response smaller than expected")
+
+        errorcode = struct.unpack("<I", bytes(resp[8:12]))[0]
+        if not (errorcode == BlobReturnCodes.SUCCESS or \
+                                    errorcode == BlobReturnCodes.NOTMODIFIED):
+            raise HpIloError(errorcode)
+
+        self.unloadchifhandle(lib)
+
+        return resp
+
     def get_info(self, key, namespace):
         """Get information for a particular blob
 

src/redfish/hpilo/rishpilo.py

@@ -101,7 +101,7 @@ def __init__(self):
                     if status == BlobReturnCodes.CHIFERR_NoDriver:
                         errmsg = "chif"
                     elif status == BlobReturnCodes.CHIFERR_AccessDenied:
-                        errmsg = "You must be root/Administrator to use this program."
+                        errmsg = "You must be root/Administrator to use this program."                    
                     raise HpIloInitialError(errmsg)
 
                 self.dll.ChifSetRecvTimeout(self.fhandle, 30000)

src/redfish/rest/v1.py

@@ -33,18 +33,20 @@
 import ctypes
 import hashlib
 import logging
+import httplib
 import platform
 try:
     import io
 except ImportError:
     pass
 
+from StringIO import StringIO
 from collections import (OrderedDict)
 
 import urlparse2 #pylint warning disable
 
 from redfish.hpilo.rishpilo import HpIloChifPacketExchangeError
-from redfish.hpilo.risblobstore2 import BlobStore2, Blob2OverrideError
+from redfish.hpilo.risblobstore2 import BlobStore2, Blob2OverrideError, ChifDllMissingError
 
 #---------End of imports---------
 
@@ -79,6 +81,10 @@ class JsonDecodingError(Exception):
     """Raised when there is an error in json data."""
     pass
 
+class SecurityStateError(Exception):
+    """Raised when there is a strict security state."""
+    pass
+
 class RisObject(dict):
     """Converts a JSON/Rest dict into a object so you can use .property
     notation"""
@@ -1419,7 +1425,7 @@ def get_client_instance(base_url=None, username=None, password=None, \
         if platform.system() == 'Windows':
             if not ctypes.windll.kernel32.LoadLibraryA('ilorest_chif'):
                 if not ctypes.windll.kernel32.LoadLibraryA('hprest_chif'):
-	                raise ChifDriverMissingOrNotFound()
+                    raise ChifDllMissingError()
         else:
             if not os.path.isdir('/dev/hpilo'):
                 raise ChifDriverMissingOrNotFound()

src/redfish/ris/rmc.py

@@ -1842,6 +1842,7 @@ def merge_dict(self, currdict, newdict):
 
     def get_error_messages(self):
         """Handler of error messages from iLO"""
+        LOGGER.info("Entering validation...")
         errmessages = {}
         reglist = []
         iloversion = self.getiloversion()