oc-cdtapi 3.13.8__py3-none-any.whl → 3.13.10__py3-none-any.whl

oc_cdtapi/Dbsm2API.py

@@ -27,7 +27,7 @@ class Dbsm2API (API.HttpAPI):
         self.exit_states = ['FAILED', 'SUCCESS']
 
         # wait for state timeout
-        self.wait_state_timeout = 1000
+        self.wait_state_timeout = 1800
 
         # wait for state request interval
         self.wait_state_sleep = 30
@@ -45,7 +45,7 @@ class Dbsm2API (API.HttpAPI):
         self.web.auth = None
         self.raise_exception_high = 499
 
-    def create_custom_image(self, version=None, distr_type=None, client_filter=None, client_code=None):
+    def create_custom_image(self, version=None, distr_type=None, client_filter=None, client_code=None, schema_name=None):
         """
         Sends request to create custom image
         :param str version: version of product
@@ -58,6 +58,10 @@ class Dbsm2API (API.HttpAPI):
         logging.debug('distr_type: [%s]' % distr_type)
         logging.debug('client_filter: [%s]' % client_filter)
         logging.debug('client_code: [%s]' % client_code)
+        logging.debug('schema_name: [%s]' % schema_name)
+        if client_filter is None:
+            logging.debug('received None client_filter, setting to empty string')
+            client_filter = ''
 
         url = posixpath.join('api', 'v1', 'images', 'custom-cdt')
         headers = self.get_headers()
@@ -70,8 +74,11 @@ class Dbsm2API (API.HttpAPI):
             'oracle_encoding': self.oracle_encoding,
             'oracle_version': self.oracle_version,
             'oracle_edition': self.oracle_edition,
+            'schema_name': schema_name,
             'remap_tablespaces': 'true'
         }
+        logging.debug('dumping request params')
+        logging.debug(json.dumps(params, indent=4))
         r = self.post(url, headers=headers, json=params)
         return self.json_or_none(r)
 
@@ -121,6 +128,11 @@ class Dbsm2API (API.HttpAPI):
         """
         logging.debug('Reached get_image_details')
         logging.debug('image_id: [%s]' % image_id)
+
+        if image_id is None:
+            logging.debug('received None image_id, returning None')
+            return None
+
         headers = self.get_headers()
         url = posixpath.join('api', 'v1', 'images', image_id)
         r = self.get(url, headers=headers)
@@ -218,6 +230,14 @@ class Dbsm2API (API.HttpAPI):
         """
         logging.debug('Reached wait_for_image')
         logging.debug('audit_id: [%s]' % audit_id)
+
+        if not isinstance(self.wait_state_timeout, int):
+            logging.debug('wait_state_timeout is not integer, attempting to convert')
+            self.wait_state_timeout = int(self.wait_state_timeout)
+        if not isinstance(self.wait_state_sleep, int):
+            logging.debug('wait_state_sleep in not integer, attempting to convert')
+            self.wait_state_sleep = int(self.wait_state_sleep)
+
         ela = 0
         st = int(time.time())
         audit = None

{oc_cdtapi-3.13.8.dist-info → oc_cdtapi-3.13.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oc-cdtapi
-Version: 3.13.8
+Version: 3.13.10
 Summary: Custom Development python API libraries
 License: Apache2.0
 Requires-Python: >=3.6

{oc_cdtapi-3.13.8.dist-info → oc_cdtapi-3.13.10.dist-info}/RECORD

@@ -1,5 +1,5 @@
 oc_cdtapi/API.py,sha256=hpdnzyirYT_wISeznRmoqr-umYRT6uqKVwhmCXyj8Nk,12398
-oc_cdtapi/Dbsm2API.py,sha256=_BdPbQC650G4qrzBuqlqvPE5TsFuWWMSwKaUwQ7ZCWs,8697
+oc_cdtapi/Dbsm2API.py,sha256=igPIos7ArjKPnV41U9fHGc36ECvG25IFoSvizX9E59Y,9596
 oc_cdtapi/DevPIAPI.py,sha256=Nn63Ob0kA5XXuRZ3OIWG2rcnSsztKq9yPI6Lu2zX3Gk,1836
 oc_cdtapi/DmsAPI.py,sha256=eNFdwQLhCbPvHB5SUtP4QcZZtSdjkgt_Cxn3oQ3iJ5s,15605
 oc_cdtapi/DmsGetverAPI.py,sha256=ZPU4HlF59fngKu5mSFhtss3rlBuduffDOSm_y3XWrxk,15556
@@ -9,9 +9,9 @@ oc_cdtapi/NexusAPI.py,sha256=uU12GtHvKlWorFaPAnFcQ5AGEc94MZ5SdmfM2Pw3F7A,26122
 oc_cdtapi/RundeckAPI.py,sha256=O3LmcFaHSz8UqeUyIHTTEMJncDD191Utd-iZaeJay2s,24243
 oc_cdtapi/TestServer.py,sha256=HV97UWg2IK4gOYAp9yaMdwFUWsw9v66MxyZdI3qQctA,2715
 oc_cdtapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oc_cdtapi-3.13.8.data/scripts/nexus.py,sha256=4teqZ_KtCSrwHDJVgA7lkreteod4Xt5XJFZNbwb7E6E,6858
-oc_cdtapi-3.13.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-oc_cdtapi-3.13.8.dist-info/METADATA,sha256=RrUZhqf1eyQxt2NkB0nFKdD4av2WjbszwCsDgofyt9I,254
-oc_cdtapi-3.13.8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-oc_cdtapi-3.13.8.dist-info/top_level.txt,sha256=d4-5-D-0CSeSXYuLCP7-nIFCpjkfmJr-Y_muzds8iVU,10
-oc_cdtapi-3.13.8.dist-info/RECORD,,
+oc_cdtapi-3.13.10.data/scripts/nexus.py,sha256=4teqZ_KtCSrwHDJVgA7lkreteod4Xt5XJFZNbwb7E6E,6858
+oc_cdtapi-3.13.10.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+oc_cdtapi-3.13.10.dist-info/METADATA,sha256=Eu3YW8QPaTrux15ntpOOYfMo9y5V9An2e39S68paeiA,255
+oc_cdtapi-3.13.10.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+oc_cdtapi-3.13.10.dist-info/top_level.txt,sha256=d4-5-D-0CSeSXYuLCP7-nIFCpjkfmJr-Y_muzds8iVU,10
+oc_cdtapi-3.13.10.dist-info/RECORD,,