[all] Release the new Python client

OpenCTI-Platform · Jul 11, 2019 · 29fec30 · 29fec30
1 parent 3445ae8
commit 29fec30
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/examples/stix2/import.py b/examples/stix2/import.py
@@ -9,7 +9,7 @@
 config = yaml.load(open(os.path.dirname(__file__) + '/../config.yml'))
 
 # File to import
-file_to_import = './enterprise-attack.json'
+file_to_import = '/home/oxid/Dropbox/Developpement/Associations/Luatix/Produits/OpenCTI/cti/enterprise-attack/enterprise-attack.json'
 
 # OpenCTI initialization
 opencti_api_client = OpenCTIApiClient(config['opencti']['url'], config['opencti']['token'])

diff --git a/pycti/opencti_api_client.py b/pycti/opencti_api_client.py
@@ -20,10 +20,11 @@ class OpenCTIApiClient:
     """
 
     def __init__(self, url, token, log_level='info'):
+        self.log_level = log_level
         # Configure logger
-        numeric_level = getattr(logging, log_level.upper(), None)
+        numeric_level = getattr(logging, self.log_level.upper(), None)
         if not isinstance(numeric_level, int):
-            raise ValueError('Invalid log level: ' + log_level)
+            raise ValueError('Invalid log level: ' + self.log_level)
         logging.basicConfig(level=numeric_level)
 
         self.api_url = url + '/graphql'
@@ -3565,16 +3566,16 @@ def stix2_import_bundle_from_file(self, file_path, update=False, types=[]):
         with open(os.path.join(file_path)) as file:
             data = json.load(file)
 
-        stix2 = OpenCTIStix2(self, log_level)
+        stix2 = OpenCTIStix2(self, self.log_level)
         stix2.import_bundle(data, update, types)
 
     def stix2_import_bundle(self, json_data, update=False, types=[]):
         data = json.loads(json_data)
-        stix2 = OpenCTIStix2(self, log_level)
+        stix2 = OpenCTIStix2(self, self.log_level)
         stix2.import_bundle(data, update, types)
 
     def stix2_export_entity(self, entity_type, entity_id, mode='simple'):
-        stix2 = OpenCTIStix2(self, log_level)
+        stix2 = OpenCTIStix2(self, self.log_level)
         bundle = {
             'type': 'bundle',
             'id': 'bundle--' + str(uuid.uuid4()),
@@ -3589,7 +3590,7 @@ def stix2_export_entity(self, entity_type, entity_id, mode='simple'):
         return bundle
 
     def stix2_export_bundle(self, types=[]):
-        stix2 = OpenCTIStix2(self, log_level)
+        stix2 = OpenCTIStix2(self, self.log_level)
         uuids = []
         bundle = {
             'type': 'bundle',

diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
     print("warning: pypandoc module not found, could not convert Markdown to RST")
     read_md = lambda f: open(f, 'r').read()
 
-VERSION = "1.2.8"
+VERSION = "1.2.9"
 
 
 class VerifyVersionCommand(install):