Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CONF
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UvA
CONF
Commits
11d83af3
Commit
11d83af3
authored
Mar 10, 2020
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed error with deserialize_model. from_dict was not creating correct model
parent
bde03643
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
55 additions
and
469 deletions
+55
-469
docker-compose.yml
docker-compose.yml
+16
-8
default_controller-1.py
...ask-server/sure_tosca/controllers/default_controller-1.py
+0
-444
default_controller.py
...flask-server/sure_tosca/controllers/default_controller.py
+2
-2
tosca_helper.py
sure_tosca-flask-server/sure_tosca/service/tosca_helper.py
+1
-4
tosca_template_service.py
...flask-server/sure_tosca/service/tosca_template_service.py
+3
-1
test_default_controller.py
...a-flask-server/sure_tosca/test/test_default_controller.py
+1
-2
util.py
sure_tosca-flask-server/sure_tosca/util.py
+29
-5
test-requirements.txt
sure_tosca-flask-server/test-requirements.txt
+3
-3
No files found.
docker-compose.yml
View file @
11d83af3
...
...
@@ -117,14 +117,22 @@ services:
environment
:
RABBITMQ_HOST
:
rabbit
#provisioner:
#depends_on:
#- rabbit
#- sure-tosca
#image: alogo53/provisioner:3.0.0
#environment:
#RABBITMQ_HOST: rabbit
#SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
provisioner
:
depends_on
:
-
rabbit
-
sure-tosca
image
:
alogo53/provisioner:3.0.0
environment
:
RABBITMQ_HOST
:
rabbit
SURE_TOSCA_BASE_PATH
:
http://sure-tosca:8081/tosca-sure/1.0.0
deployer
:
depends_on
:
-
rabbit
-
sure-tosca
image
:
alogo53/deployer:3.0.0
environment
:
RABBITMQ_HOST
:
rabbit
#volumes:
...
...
sure_tosca-flask-server/sure_tosca/controllers/default_controller-1.py
deleted
100644 → 0
View file @
bde03643
This diff is collapsed.
Click to expand it.
sure_tosca-flask-server/sure_tosca/controllers/default_controller.py
View file @
11d83af3
...
...
@@ -391,7 +391,7 @@ def set_node_properties(id, properties, node_name): # noqa: E501
if
res
:
return
res
return
'Not Found'
,
404
k
def
upload_tosca_template
(
file
):
# noqa: E501
"""upload a tosca template description file
...
...
@@ -441,4 +441,4 @@ def get_node_attributes(id, node_name): # noqa: E501
res
=
tosca_template_service
.
get_node_attributes
(
id
,
node_name
)
if
res
:
return
res
return
'Not Found'
,
404
return
'Not Found'
,
404
\ No newline at end of file
sure_tosca-flask-server/sure_tosca/service/tosca_helper.py
View file @
11d83af3
...
...
@@ -293,7 +293,4 @@ def get_node_template_dict(node_template):
# print(dir(node_template))
# print(node_template.templates)
return
node_template_dict
return
node_template_dict
\ No newline at end of file
sure_tosca-flask-server/sure_tosca/service/tosca_template_service.py
View file @
11d83af3
...
...
@@ -45,6 +45,7 @@ root_key = 'root_key'
def
query_db
(
queries
,
db
=
None
):
results
=
db
.
all
()
if
queries
:
query
=
reduce
(
lambda
a
,
b
:
a
&
b
,
queries
)
results
=
db
.
search
(
query
)
...
...
@@ -221,6 +222,7 @@ def get_node_templates(id, type_name=None, node_name=None, has_interfaces=None,
prop
=
None
queries
.
append
(
query
.
artifacts
!=
prop
)
query_results
=
query_db
(
queries
,
db
=
node_template_db
)
return
change_to_node_template_model
(
query_results
)
...
...
@@ -478,4 +480,4 @@ def get_default_interface(id, interface_type, instance_name, operation_name):
instance_inputs
=
{
'inputs'
:
instance_inputs_list
}
operation
=
{
operation_name
:
instance_inputs
}
instance
=
{
instance_name
:
operation
}
return
instance
return
instance
\ No newline at end of file
sure_tosca-flask-server/sure_tosca/test/test_default_controller.py
View file @
11d83af3
...
...
@@ -30,7 +30,6 @@ class TestDefaultController(BaseTestCase):
self
.
assertTrue
(
response
.
is_json
)
self
.
assertIsInstance
(
response
.
json
,
list
)
def
test_get_all_ancestor_types
(
self
):
"""Test case for get_all_ancestor_types
...
...
@@ -402,4 +401,4 @@ class TestDefaultController(BaseTestCase):
if
__name__
==
'__main__'
:
import
unittest
unittest
.
main
()
unittest
.
main
()
\ No newline at end of file
sure_tosca-flask-server/sure_tosca/util.py
View file @
11d83af3
...
...
@@ -89,7 +89,6 @@ def deserialize_datetime(string):
except
ImportError
:
return
string
def
deserialize_model
(
data
,
klass
):
"""Deserializes list or dict to model.
...
...
@@ -104,14 +103,39 @@ def deserialize_model(data, klass):
return
data
for
attr
,
attr_type
in
six
.
iteritems
(
instance
.
swagger_types
):
if
data
is
not
None
\
and
instance
.
attribute_map
[
attr
]
in
data
\
and
isinstance
(
data
,
(
list
,
dict
)):
value
=
data
[
instance
.
attribute_map
[
attr
]]
if
data
is
not
None
and
isinstance
(
data
,
(
list
,
dict
)):
value
=
None
if
instance
.
attribute_map
[
attr
]
in
data
:
value
=
data
[
instance
.
attribute_map
[
attr
]]
elif
attr
in
data
:
value
=
data
[
attr
]
setattr
(
instance
,
attr
,
_deserialize
(
value
,
attr_type
))
return
instance
# def deserialize_model(data, klass):
# """Deserializes list or dict to model.
#
# :param data: dict, list.
# :type data: dict | list
# :param klass: class literal.
# :return: model object.
# """
# instance = klass()
#
# if not instance.swagger_types:
# return data
#
# for attr, attr_type in six.iteritems(instance.swagger_types):
# if data is not None \
# and instance.attribute_map[attr] in data \
# and isinstance(data, (list, dict)):
# value = data[instance.attribute_map[attr]]
# setattr(instance, attr, _deserialize(value, attr_type))
#
# return instance
def
_deserialize_list
(
data
,
boxed_type
):
"""Deserializes a list and its elements.
...
...
sure_tosca-flask-server/test-requirements.txt
View file @
11d83af3
wheel==0.3
3.6
flask-testing==0.
7.1
wheel==0.3
4.2
flask-testing==0.
8.0
coverage==5.0.3
nose>=1.3.7
pluggy>=0.13.1
randomize>=0.14
Werkzeug==0.16.1
\ No newline at end of file
Werkzeug==1.0.0
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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