Skip to content

Commit c0d2ff9

Browse files
authored
Merge pull request #58 from Akasurde/minor_fix
Minor changes in fortiosapi
2 parents 4af827a + 2835098 commit c0d2ff9

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

fortiosapi/fortiosapi.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
###################################################################
2020
#
21-
# fortiosapi.py aims at simplyfing the configuration and
21+
# fortiosapi.py aims at simplifying the configuration and
2222
# integration of Fortgate configuration using the restapi
2323
#
2424
# A Python module to abstract configuration using FortiOS REST API
@@ -169,7 +169,6 @@ def login(self, host, username, password, verify=True, cert=None, timeout=12, vd
169169
self._session.cert = cert
170170
# set the default at 12 see request doc for details http://docs.python-requests.org/en/master/user/advanced/
171171
self.timeout = timeout
172-
self.timeout = timeout
173172

174173
res = self._session.post(
175174
url,
@@ -503,7 +502,7 @@ def setoverlayconfig(self, yamltree, vdom=None):
503502

504503
yamltreel3 = OrderedDict()
505504
yamltreel3 = copy.deepcopy(yamltree)
506-
LOG.debug("intial yamltreel3 is %s ", yamltreel3)
505+
LOG.debug("initial yamltreel3 is %s ", yamltreel3)
507506
for name in yamltree.copy():
508507
for path in yamltree[name]:
509508
for k in yamltree[name][path].copy():
@@ -516,7 +515,7 @@ def setoverlayconfig(self, yamltree, vdom=None):
516515
else:
517516
# Should then be a string only so remove from yamltreel3
518517
del yamltreel3[name][path]
519-
# yamltree and yamltreel3 are now differents
518+
# yamltree and yamltreel3 are now different
520519
LOG.debug("after yamltree is %s ", yamltree)
521520
LOG.debug("after yamltreel3 is %s ", yamltreel3)
522521
restree = False

requirements.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
pexpect
2+
requests
3+
paramiko
24
nose
35
packaging
46
oyaml

tests/Certs.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Explanation about certificats to test validity with the api and auth with cert
1+
# Explanation about certificates to test validity with the api and auth with cert
22

33
From: https://cookbook.fortinet.com/preventing-certificate-warnings-self-signed-60/
44
```bash

0 commit comments

Comments
 (0)