Skip to content

Commit b0d098a

Browse files
Merge pull request #14 from SPOpenSource/release/0.15.2-a1
Release/0.15.2 a1
2 parents c8e4670 + 0d24c2d commit b0d098a

33 files changed

Lines changed: 6102 additions & 102 deletions

.gitignore

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,14 @@ wheels/
2525
.installed.cfg
2626
*.egg
2727

28-
# Tests & Documentation
29-
tests/
28+
# Dev
29+
.vscode
30+
31+
# Tests
32+
tests/dev
33+
.tox
34+
35+
# Documentation
3036
docs/build/
3137
docs/source/_build
3238
examples/generate_preconfig/preconfig_outputs

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
exclude *.nix
22
exclude .pre-commit-config.yaml
33
include *.py
4-
include testing/*.py
4+
include tests/test*.py
55
include tox.ini
66
include *.md
77
include LICENSE

_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version = "0.15.1a1.dev0"
1+
version = "0.15.1a2.dev28"

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# Main version number
1717
version = "0.15"
1818
# The full version, including alpha/beta/rc tags
19-
release = "0.15.1-a1"
19+
release = "0.15.2-a1"
2020

2121

2222
# -- General configuration ---------------------------------------------------

docs/source/examples/generate_preconfig.rst

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,19 @@
33
44
.. important::
55

6-
The following example is more complex code than the other examples,
6+
The following example is more complex code than the general examples,
77
generating data and interacting with Orchestrator. Using and
88
modifying these examples requires a greater understanding of python
99
functions, handling variables, and additional tools such as Jinja.
1010

1111

12+
.. note::
13+
14+
The code referenced in this document and all published examples
15+
with pyedgeconnect are available from the GitHub repository within the
16+
`examples <https://https://github.com/SPOpenSource/edgeconnect-python/tree/main/examples>`_
17+
folder
18+
1219
Generate EdgeConnect Preconfig
1320
------------------------------
1421

@@ -154,17 +161,19 @@ Additional availble runtime arguments are as follows:
154161
- ``-o`` or ``--orch``
155162
- Type: String
156163
- Desc: Specify the Orchestrator IP or FQDN
157-
- Example values: ``10.100.1.90`` or ``orchestrator.<company>.com``
164+
- Example values: ``192.0.2.100`` or ``orchestrator.<company>.com``
158165
- Default value: ``None``
159166
- ``-u`` or ``--upload``
160167
- Type: Boolean
161-
- Desc: Upload the rendered YAML preconfig to Orchestrator
162-
- Accepted values: ``True`` or ``False``
168+
- Desc: Upload the rendered YAML preconfig to Orchestrator.
169+
Including the ``-u`` will translate to ``True``, no option will
170+
default to ``False``
163171
- Default value: ``False``
164172
- ``-aa`` or ``--autoapply``
165173
- Type: Boolean
166-
- Desc: Auto-apply the YAML preconfig on Orchestrator to a discovered appliance
167-
- Accepted values: ``True`` or ``False``
174+
- Desc: Auto-apply the YAML preconfig on Orchestrator to a
175+
discovered appliance. Including the ``-aa`` will translate to
176+
``True``, no option will default to ``False``
168177
- Default value: ``False``
169178
- ``-j`` or ``--jinja``
170179
- Type: String
@@ -209,7 +218,8 @@ Orchestrator API calls
209218
^^^^^^^^^^^^^^^^^^^^^^^^^^
210219

211220
The two API calls to Orchestrator (outside of authentication) are
212-
``validate_preconfig`` and ``create_preconfig``.
221+
:func:`pyedgeconnect.Orchestrator.validate_preconfig` and
222+
:func:`pyedgeconnect.Orchestrator.create_preconfig`.
213223

214224
The ``validate_preconfig`` function sends the preconfig YAML text to
215225
Orchestrator and will either return a success (HTTP 200 OK) or if

docs/source/examples/index.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ Example Code from Repository
33
============================
44

55
All examples documented in this section are available from the
6-
GitHub repository within the ``examples`` folder:
7-
https://github.com/SPOpenSource/edgeconnect-python/tree/main/examples
6+
GitHub repository within the
7+
`examples <https://https://github.com/SPOpenSource/edgeconnect-python/tree/main/examples>`_
8+
folder:
9+
810

911
Example script documentation and instructions
1012

@@ -13,4 +15,5 @@ Example script documentation and instructions
1315

1416
auth_example
1517
basic_examples
16-
generate_preconfig
18+
generate_preconfig
19+
upload_security_policy

0 commit comments

Comments
 (0)