Code Review
/
sdc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
TLS sdc-be-init: truststore & keystore handling
[sdc.git]
/
catalog-be
/
src
/
main
/
resources
/
scripts
/
sdcBePy
/
common
/
normative
/
toscaElements.py
diff --git
a/catalog-be/src/main/resources/scripts/sdcBePy/common/normative/toscaElements.py
b/catalog-be/src/main/resources/scripts/sdcBePy/common/normative/toscaElements.py
index
ef23e3f
..
50f4be2
100644
(file)
--- a/
catalog-be/src/main/resources/scripts/sdcBePy/common/normative/toscaElements.py
+++ b/
catalog-be/src/main/resources/scripts/sdcBePy/common/normative/toscaElements.py
@@
-9,11
+9,12
@@
from sdcBePy.common.errors import ResourceCreationError
def process_and_create_normative_element(normative_element,
def process_and_create_normative_element(normative_element,
- scheme=None, be_host=None, be_port=None, header=None, admin_user=None, sdc_be_proxy=None,
+ scheme=None, be_host=None, be_port=None, header=None, admin_user=None,
+ tls_cert=None, tls_key=None, tls_key_pw=None, ca_cert=None, sdc_be_proxy=None,
model=None, debug=False,
exit_on_success=False):
if sdc_be_proxy is None:
model=None, debug=False,
exit_on_success=False):
if sdc_be_proxy is None:
- sdc_be_proxy = SdcBeProxy(be_host, be_port, header, scheme, admin_user, debug=debug)
+ sdc_be_proxy = SdcBeProxy(be_host, be_port, header, scheme,
tls_cert, tls_key, tls_key_pw, ca_cert,
admin_user, debug=debug)
file_dir, url_suffix, element_name, element_from_name, with_metadata = normative_element.get_parameters()
_create_normative_element(sdc_be_proxy,
file_dir, url_suffix, element_name, element_from_name, with_metadata = normative_element.get_parameters()
_create_normative_element(sdc_be_proxy,