Skip to content

Commit 4baf721

Browse files
Merge pull request #52 from solidfire/release/1.7
Python SDK: 1.7 Release
2 parents 1ca1157 + 991e836 commit 4baf721

37 files changed

Lines changed: 42345 additions & 171 deletions

MANIFEST.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
include LICENSE README.rst
22
recursive-include solidfire *
33
recursive-exclude solidfire *.pyc
4-
include MANIFEST.in
4+
include MANIFEST.in
5+
include python_version.json
327 KB
Binary file not shown.
-146 KB
Binary file not shown.

README.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![sf-python-logo](https://raw.githubusercontent.com/solidfire/solidfire-sdk-python/master/img/python-50.png) SolidFire Python SDK v1.5
1+
![sf-python-logo](https://raw.githubusercontent.com/solidfire/solidfire-sdk-python/master/img/python-50.png) SolidFire Python SDK v1.7
22

33
Python SDK library for interacting with SolidFire Element API
44

@@ -23,7 +23,7 @@ Compatibility
2323

2424
| Component | Version |
2525
|:-------------------------|:--------------|
26-
| SolidFire Element OS | 7.0 - 10.0 |
26+
| SolidFire Element OS | 10.0 - 12.2 |
2727

2828
Getting Help
2929
------------
@@ -37,11 +37,8 @@ new features and capabilities.
3737
Documentation
3838
-------------
3939

40-
[Latest Docs](http://solidfire-sdk-python.readthedocs.io)
41-
4240
[Release
43-
Notes](https://github.com/solidfire/solidfire-sdk-python/blob/master/NetApp_SolidFire_Python_SDK_Release_Notes.pdf)
44-
41+
Notes](NetAppElementPythonSDKReleaseNotes1_7.pdf)
4542

4643
Installation
4744
------------
@@ -122,13 +119,15 @@ account from the add\_account\_result object.
122119
### More examples using the Python SDK
123120

124121
from solidfire.factory import ElementFactory
122+
from solidfire.models import *
125123

126124
# Create connection to SF Cluster
127125
sfe = ElementFactory.create("ip-address-of-cluster", "username", "password")
128126

129127
# --------- EXAMPLE 1 - CREATE AN ACCOUNT -----------
130128
# Send the request with required parameters and gather the result
131-
add_account_result = sfe.add_account(username="example-account")
129+
add_account_result = sfe.add_account(username="example-account",
130+
initiator_secret=CHAPSecret(secret="asdfghjkl"))
132131
# Pull the account ID from the result object
133132
account_id = add_account_result.account_id
134133

@@ -179,18 +178,18 @@ unreachable):
179178

180179
from solidfire.factory import ElementFactory
181180
sfe = ElementFactory.create("ip-address-of-cluster", "username", "password")
182-
sfe.timeout(600)
181+
sfe.connect_timeout(600)
183182

184183
Read timeout (useful for extending time for a service call to return):
185184

186185
from solidfire.factory import ElementFactory
187186
sfe = ElementFactory.create("ip-address-of-cluster", "username", "password")
188-
sfe.read_timeout(600)
187+
sfe.timeout(600)
189188

190189
**License**
191190
-----------
192191

193-
Copyright © 2016, 2017 NetApp, Inc. All rights reserved.
192+
Copyright © 2020, 2021 NetApp, Inc. All rights reserved.
194193

195194
Licensed under the Apache License, Version 2.0 (the "License"); you may
196195
not use this file except in compliance with the License. You may obtain

README.rst

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Python SDK library for interacting with SolidFire Element API
88
Current Release
99
---------------
1010

11-
Version 1.5.0.87
11+
Version 1.7.0.124
1212

1313
Description
1414
-----------
@@ -26,7 +26,7 @@ Compatibility
2626
+------------------------+---------------+
2727
| Component | Version |
2828
+========================+===============+
29-
| SolidFire Element OS | 7.0 - 10.0 |
29+
| SolidFire Element OS | 10.0 - 12.2 |
3030
+------------------------+---------------+
3131

3232
Getting Help
@@ -40,10 +40,8 @@ helps us focus our efforts on new features and capabilities.
4040
Documentation
4141
-------------
4242

43-
`Latest Docs <http://solidfire-sdk-python.readthedocs.io/>`__
44-
4543
`Release
46-
Notes <https://github.com/solidfire/solidfire-sdk-python/blob/master/NetApp_SolidFire_Python_SDK_Release_Notes.pdf>`__
44+
Notes <NetAppElementPythonSDKReleaseNotes1_7.pdf>`__
4745

4846
Installation
4947
------------
@@ -203,7 +201,7 @@ Read timeout (useful for extending time for a service call to return):
203201
**License**
204202
-----------
205203

206-
Copyright © 2016, 2017 NetApp, Inc. All rights reserved.
204+
Copyright © 2020, 2021 NetApp, Inc. All rights reserved.
207205

208206
Licensed under the Apache License, Version 2.0 (the "License"); you may
209207
not use this file except in compliance with the License. You may obtain
@@ -227,5 +225,4 @@ limitations under the License.
227225
.. |downloads| image:: https://img.shields.io/pypi/dm/solidfire-sdk-python.svg
228226
:target: https://pypi.python.org/pypi/solidfire-sdk-python/
229227
.. |license| image:: https://img.shields.io/pypi/l/solidfire-sdk-python.svg
230-
:target: https://pypi.python.org/pypi/solidfire-sdk-python/
231-
228+
:target: https://pypi.python.org/pypi/solidfire-sdk-python/

descriptor_version.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"major": 1,
3-
"version": "1.5.0.36",
4-
"build": 36,
5-
"minor": 5,
3+
"version": "1.7.0.0",
4+
"build": 0,
5+
"minor": 7,
66
"patch": 0
77
}

docs/_static/solidfire.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
dl.attribute {
2+
visibility: hidden;
3+
display: none;
4+
}

docs/conf.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33
import sphinx_rtd_theme
4-
import os
54
import sys
5+
import os
6+
import json
67

7-
sys.path.insert(0, '../..')
8+
sys.path.insert(0, os.path.abspath('..'))
89

910
extensions = [
1011
'sphinx.ext.autodoc',
@@ -16,18 +17,23 @@
1617
source_suffix = '.rst'
1718
master_doc = 'index'
1819
project = 'solidfire-sdk-python'
19-
copyright = '2014-2017, NetApp, Inc. All Rights Reserved.'
20-
author = 'Adam Haid'
21-
version = '1.5.0.87'
22-
release = '1.5.0.87'
20+
copyright = '2014-2020, NetApp, Inc. All Rights Reserved.'
2321
language = 'en'
22+
author = 'NetApp'
2423

2524
exclude_patterns = ['_build']
2625
pygments_style = 'sphinx'
2726
todo_include_todos = True
2827
autoclass_content = 'both'
2928
seen_element = False
3029

30+
with open('../python_version.json') as versionfile:
31+
versioninfo = json.load(versionfile)
32+
version = release = versioninfo['version']
33+
34+
def setup(app):
35+
app.add_stylesheet("solidfire.css")
36+
3137

3238
html_theme = "sphinx_rtd_theme"
3339
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]

0 commit comments

Comments
 (0)