Commit 7ec82d5e authored by Spiros Koulouzis's avatar Spiros Koulouzis

changed ids

made deep copy for tosa template
parent 7e75bf9e
......@@ -2,11 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="462ede19-adfe-472b-975e-fefefa973fe0" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/../TOSCA/application_example_2_topologies.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../TOSCA/application_example_2_topologies.yaml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../openAPI/TOSCA/TopologyTemplate.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../openAPI/TOSCA/TopologyTemplate.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/models/topology_template.py" beforeDir="false" afterPath="$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/models/topology_template.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../openAPI/TOSCA/OutputParameters.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../openAPI/TOSCA/OutputParameters.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/controllers/default_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/controllers/default_controller.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/service/tosca_template_service.py" beforeDir="false" afterPath="$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/service/tosca_template_service.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/swagger/swagger.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/swagger/swagger.yaml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......
---
definitions:
docsoasisopenorgtoscans201112:OutputParameters:
required:
- OutputParameter
type: object
properties:
OutputParameter:
type: array
items:
"$ref": "#/definitions/docsoasisopenorgtoscans201112:tParameter"
docsoasisopenorgtoscans201112:tParameter:
properties:
name:
type: string
type:
type: string
required:
type: boolean
required:
- name
- type
type: object
lang:
type: string
space:
enum:
- default
- preserve
type: string
definitions:
Output:
properties:
name:
type: string
type:
type: string
description:
type: string
required:
type: boolean
value:
type: $ref: "#/definitions/Value"
Value:
properties:
name:
type: string
......@@ -20,7 +20,7 @@
outputs:
type: string
additionalProperties:
type: object
type: object
groups:
type: object
additionalProperties:
......
......@@ -3,6 +3,6 @@
# flake8: noqa
from __future__ import absolute_import
# import models into model package
from sure_tosca.models.node_template import NodeTemplate
from sure_tosca.models.topology_template import TopologyTemplate
from sure_tosca.models.tosca_template import ToscaTemplate
from sure_tosca.models.node_template import NodeTemplateModel
from sure_tosca.models.topology_template import TopologyTemplateModel
from sure_tosca.models.tosca_template import ToscaTemplateModel
......@@ -9,7 +9,7 @@ from sure_tosca.models.base_model_ import Model
from sure_tosca import util
class NodeTemplate(Model):
class NodeTemplateModel(Model):
"""NOTE: This class is auto generated by the swagger code generator program.
Do not edit the class manually.
......@@ -84,7 +84,7 @@ class NodeTemplate(Model):
:param dikt: A dict.
:type: dict
:return: The NodeTemplate of this NodeTemplate. # noqa: E501
:rtype: NodeTemplate
:rtype: NodeTemplateModel
"""
return util.deserialize_model(dikt, cls)
......
......@@ -5,12 +5,12 @@ from datetime import date, datetime # noqa: F401
from typing import List, Dict # noqa: F401
from sure_tosca.models import NodeTemplate
from sure_tosca.models import NodeTemplateModel
from sure_tosca.models.base_model_ import Model
from sure_tosca import util
class TopologyTemplate(Model):
class TopologyTemplateModel(Model):
"""NOTE: This class is auto generated by the swagger code generator program.
Do not edit the class manually.
......@@ -24,11 +24,11 @@ class TopologyTemplate(Model):
:param inputs: The inputs of this TopologyTemplate. # noqa: E501
:type inputs: List[Dict[str, object]]
:param node_templates: The node_templates of this TopologyTemplate. # noqa: E501
:type node_templates: Dict[str, NodeTemplate]
:type node_templates: Dict[str, NodeTemplateModel]
:param relationship_templates: The relationship_templates of this TopologyTemplate. # noqa: E501
:type relationship_templates: Dict[str, object]
:param outputs: The outputs of this TopologyTemplate. # noqa: E501
:type outputs: str
:type outputs: Dict[str, object]
:param groups: The groups of this TopologyTemplate. # noqa: E501
:type groups: Dict[str, object]
:param substitution_mappings: The substitution_mappings of this TopologyTemplate. # noqa: E501
......@@ -39,9 +39,9 @@ class TopologyTemplate(Model):
self.swagger_types = {
'description': str,
'inputs': List[Dict[str, object]],
'node_templates': Dict[str, NodeTemplate],
'node_templates': Dict[str, NodeTemplateModel],
'relationship_templates': Dict[str, object],
'outputs': str,
'outputs': Dict[str, object],
'groups': Dict[str, object],
'substitution_mappings': Dict[str, object],
'policies': List[Dict[str, object]]
......@@ -74,7 +74,7 @@ class TopologyTemplate(Model):
:param dikt: A dict.
:type: dict
:return: The TopologyTemplate of this TopologyTemplate. # noqa: E501
:rtype: TopologyTemplate
:rtype: TopologyTemplateModel
"""
return util.deserialize_model(dikt, cls)
......@@ -126,7 +126,7 @@ class TopologyTemplate(Model):
:return: The node_templates of this TopologyTemplate.
:rtype: Dict[str, NodeTemplate]
:rtype: Dict[str, NodeTemplateModel]
"""
return self._node_templates
......@@ -136,7 +136,7 @@ class TopologyTemplate(Model):
:param node_templates: The node_templates of this TopologyTemplate.
:type node_templates: Dict[str, NodeTemplate]
:type node_templates: Dict[str, NodeTemplateModel]
"""
self._node_templates = node_templates
......@@ -247,6 +247,6 @@ class TopologyTemplate(Model):
self._policies = policies
def __eq__(self, other):
if isinstance(other, TopologyTemplate):
if isinstance(other, TopologyTemplateModel):
return self.__key() == other.__key()
return NotImplemented
\ No newline at end of file
......@@ -5,12 +5,12 @@ from datetime import date, datetime # noqa: F401
from typing import List, Dict # noqa: F401
from sure_tosca.models import TopologyTemplate
from sure_tosca.models import TopologyTemplateModel
from sure_tosca.models.base_model_ import Model
from sure_tosca import util
class ToscaTemplate(Model):
class ToscaTemplateModel(Model):
"""NOTE: This class is auto generated by the swagger code generator program.
Do not edit the class manually.
......@@ -30,7 +30,7 @@ class ToscaTemplate(Model):
:param template_name: The template_name of this ToscaTemplate. # noqa: E501
:type template_name: str
:param topology_template: The topology_template of this ToscaTemplate. # noqa: E501
:type topology_template: TopologyTemplate
:type topology_template: TopologyTemplateModel
:param template_author: The template_author of this ToscaTemplate. # noqa: E501
:type template_author: str
:param template_version: The template_version of this ToscaTemplate. # noqa: E501
......@@ -66,7 +66,7 @@ class ToscaTemplate(Model):
'tosca_definitions_version': str,
'tosca_default_namespace': str,
'template_name': str,
'topology_template': TopologyTemplate,
'topology_template': TopologyTemplateModel,
'template_author': str,
'template_version': str,
'description': str,
......@@ -133,7 +133,7 @@ class ToscaTemplate(Model):
:param dikt: A dict.
:type: dict
:return: The ToscaTemplate of this ToscaTemplate. # noqa: E501
:rtype: ToscaTemplate
:rtype: ToscaTemplateModel
"""
return util.deserialize_model(dikt, cls)
......@@ -206,7 +206,7 @@ class ToscaTemplate(Model):
:return: The topology_template of this ToscaTemplate.
:rtype: TopologyTemplate
:rtype: TopologyTemplateModel
"""
return self._topology_template
......@@ -216,7 +216,7 @@ class ToscaTemplate(Model):
:param topology_template: The topology_template of this ToscaTemplate.
:type topology_template: TopologyTemplate
:type topology_template: TopologyTemplateModel
"""
self._topology_template = topology_template
......@@ -537,6 +537,6 @@ class ToscaTemplate(Model):
self._repositories = repositories
def __eq__(self, other):
if isinstance(other, ToscaTemplate):
if isinstance(other, ToscaTemplateModel):
return self.__key() == other.__key()
return NotImplemented
......@@ -108,13 +108,13 @@ def get_node_types_with_interface(nodes):
def node_dict_2_node_template(node_dict, all_custom_def):
node_name = next(iter(node_dict))
node_type = node_dict[node_name]['type']
# node_type = node_dict[node_name]['type']
# for name_to_remove in node_type_key_names_to_remove:
# if name_to_remove in node_dict[node_name][node_name]:
# node_dict[node_name].pop(name_to_remove)
node_template = NodeTemplate(node_name, node_templates=node_dict, custom_def=all_custom_def)
node_template = NodeTemplate(node_name, node_templates=copy.deepcopy(node_dict), custom_def=all_custom_def)
# For some reason the tosca.nodes.ARTICONF.Orchestrator doesn't have all definitions so we need to add them
# manually. We get 'toscaparser.common.exception.InvalidTypeError: Type "tosca.nodes.ARTICONF.Orchestrator"
# is not a valid type.'
......
......@@ -5,9 +5,9 @@ from __future__ import absolute_import
from flask import json
from six import BytesIO
from sure_tosca.models.node_template import NodeTemplate # noqa: E501
from sure_tosca.models.topology_template import TopologyTemplate # noqa: E501
from sure_tosca.models.tosca_template import ToscaTemplate # noqa: E501
from sure_tosca.models.node_template import NodeTemplateModel # noqa: E501
from sure_tosca.models.topology_template import TopologyTemplateModel # noqa: E501
from sure_tosca.models.tosca_template import ToscaTemplateModel # noqa: E501
from sure_tosca.test import BaseTestCase
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment