Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CTI Tools
tosca2doc
Commits
c9b781be
Commit
c9b781be
authored
Jun 17, 2019
by
carignani
Browse files
select import root path
parent
8374ed65
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/doc2tosca.py
View file @
c9b781be
...
...
@@ -155,7 +155,7 @@ def dump_header(model_name, buf, spec_version=SPEC_VERSION, imports=None):
MODELS
=
{}
def
generate_templates
(
filename
,
spec_version
=
SPEC_VERSION
):
def
generate_templates
(
filename
,
spec_version
=
SPEC_VERSION
,
yaml_root_path
=
'uri'
):
'''
Takes a filename or file object and loads the definition into the MODELS dictionary
'''
...
...
@@ -163,9 +163,12 @@ def generate_templates(filename, spec_version=SPEC_VERSION):
print
(
"Opening "
+
filename
)
for
mn
in
MODEL_NAMES
:
import_stmt
=
'etsi_nfv_sol001_common_types.yaml'
if
yaml_root_path
!=
'local'
:
import_stmt
=
'https://forge.etsi.org/rep/nfv/SOL001/raw/{}/'
.
format
(
spec_version
)
+
import_stmt
MODELS
[
mn
]
=
tosca_model_info
(
mn
,
'-
https://forge.etsi.org/rep/nfv/SOL001/raw/{}/etsi_nfv_sol001_common_types.yaml'
.
format
(
spec_version
)
'-
'
+
import_stmt
)
try
:
...
...
src/templates/home.html
View file @
c9b781be
...
...
@@ -86,6 +86,12 @@ For any other inquiry, contact <a href="mailto:cti_support@etsi.org">ETSI CTI</a
<br
/>
Custom version (overrides the selector):
<input
type=
"text"
name=
"custom-doc-version"
>
<br
/>
Root of import statements:
<select
class=
"form-control form-control-sm"
form=
"doc2tosca-form"
name=
"yaml-root-path"
>
<option
value=
"uri"
>
Forge URL
</option>
<option
value=
"local"
>
Local (no path)
</option>
</select>
<br
/><br
/>
<center>
<input
type=
"submit"
class=
"btn btn-primary"
value=
"Upload"
/>
...
...
src/web_app.py
View file @
c9b781be
...
...
@@ -174,6 +174,7 @@ def mk_doc2tosca():
print
(
request
.
form
)
doc_version
=
request
.
form
.
get
(
'doc-version'
)
custom_doc_version
=
request
.
form
.
get
(
'custom-doc-version'
)
yaml_root_path
=
request
.
form
.
get
(
'yaml-root-path'
)
except
:
flash
(
"Something went wrong :/"
)
return
redirect
(
"/tosca-ie"
)
...
...
@@ -187,7 +188,7 @@ def mk_doc2tosca():
if
custom_doc_version
!=
""
:
doc_version
=
custom_doc_version
try
:
doc2tosca
.
generate_templates
(
sol001_file
,
doc_version
)
doc2tosca
.
generate_templates
(
sol001_file
,
doc_version
,
yaml_root_path
)
except
ValueError
as
e
:
flash
(
str
(
e
))
return
redirect
(
"/tosca-ie"
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment