Merge "Change the entity type module name for consistency"

This commit is contained in:
Jenkins
2015-09-10 20:06:46 +00:00
committed by Gerrit Code Review
4 changed files with 3 additions and 3 deletions

View File

@@ -12,7 +12,7 @@
from toscaparser.common.exception import InvalidTypeError
from toscaparser.elements.attribute_definition import AttributeDef
from toscaparser.elements.entitytype import EntityType
from toscaparser.elements.entity_type import EntityType
from toscaparser.elements.property_definition import PropertyDef

View File

@@ -161,7 +161,7 @@ class GetAttribute(Function):
def _find_host_containing_attribute(self, node_template_name=SELF):
node_template = self._find_node_template(node_template_name)
from toscaparser.elements.entitytype import EntityType
from toscaparser.elements.entity_type import EntityType
hosted_on_rel = EntityType.TOSCA_DEF[HOSTED_ON]
for r in node_template.requirements:
for requirement, target_name in r.items():

View File

@@ -17,7 +17,7 @@ from toscaparser.common.exception import MissingRequiredFieldError
from toscaparser.common.exception import UnknownFieldError
from toscaparser.dataentity import DataEntity
from toscaparser.elements.constraints import Schema
from toscaparser.elements.entitytype import EntityType
from toscaparser.elements.entity_type import EntityType
from toscaparser.utils.gettextutils import _