diff --git a/translator/toscalib/__init__.py b/toscaparser/__init__.py similarity index 100% rename from translator/toscalib/__init__.py rename to toscaparser/__init__.py diff --git a/translator/toscalib/capabilities.py b/toscaparser/capabilities.py similarity index 96% rename from translator/toscalib/capabilities.py rename to toscaparser/capabilities.py index 1a30a85..c23ef72 100644 --- a/translator/toscalib/capabilities.py +++ b/toscaparser/capabilities.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from translator.toscalib.properties import Property +from toscaparser.properties import Property class Capability(object): diff --git a/translator/toscalib/common/__init__.py b/toscaparser/common/__init__.py similarity index 100% rename from translator/toscalib/common/__init__.py rename to toscaparser/common/__init__.py diff --git a/translator/toscalib/common/exception.py b/toscaparser/common/exception.py similarity index 98% rename from translator/toscalib/common/exception.py rename to toscaparser/common/exception.py index 6a03e18..bd8d894 100644 --- a/translator/toscalib/common/exception.py +++ b/toscaparser/common/exception.py @@ -16,7 +16,7 @@ TOSCA exception classes import logging import sys -from translator.toscalib.utils.gettextutils import _ +from toscaparser.utils.gettextutils import _ log = logging.getLogger(__name__) diff --git a/translator/toscalib/dataentity.py b/toscaparser/dataentity.py similarity index 91% rename from translator/toscalib/dataentity.py rename to toscaparser/dataentity.py index 850ac8f..069d55a 100644 --- a/translator/toscalib/dataentity.py +++ b/toscaparser/dataentity.py @@ -10,17 +10,17 @@ # License for the specific language governing permissions and limitations # under the License. -from translator.toscalib.common.exception import MissingRequiredFieldError -from translator.toscalib.common.exception import TypeMismatchError -from translator.toscalib.common.exception import UnknownFieldError -from translator.toscalib.elements.constraints import Schema -from translator.toscalib.elements.datatype import DataType -from translator.toscalib.elements.scalarunit import ScalarUnit_Frequency -from translator.toscalib.elements.scalarunit import ScalarUnit_Size -from translator.toscalib.elements.scalarunit import ScalarUnit_Time +from toscaparser.common.exception import MissingRequiredFieldError +from toscaparser.common.exception import TypeMismatchError +from toscaparser.common.exception import UnknownFieldError +from toscaparser.elements.constraints import Schema +from toscaparser.elements.datatype import DataType +from toscaparser.elements.scalarunit import ScalarUnit_Frequency +from toscaparser.elements.scalarunit import ScalarUnit_Size +from toscaparser.elements.scalarunit import ScalarUnit_Time -from translator.toscalib.utils.gettextutils import _ -from translator.toscalib.utils import validateutils +from toscaparser.utils.gettextutils import _ +from toscaparser.utils import validateutils class DataEntity(object): diff --git a/translator/toscalib/elements/TOSCA_definition_1_0.yaml b/toscaparser/elements/TOSCA_definition_1_0.yaml similarity index 100% rename from translator/toscalib/elements/TOSCA_definition_1_0.yaml rename to toscaparser/elements/TOSCA_definition_1_0.yaml diff --git a/translator/toscalib/elements/__init__.py b/toscaparser/elements/__init__.py similarity index 100% rename from translator/toscalib/elements/__init__.py rename to toscaparser/elements/__init__.py diff --git a/translator/toscalib/elements/artifacttype.py b/toscaparser/elements/artifacttype.py similarity index 95% rename from translator/toscalib/elements/artifacttype.py rename to toscaparser/elements/artifacttype.py index 648ad21..3bfd7d0 100644 --- a/translator/toscalib/elements/artifacttype.py +++ b/toscaparser/elements/artifacttype.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from translator.toscalib.elements.statefulentitytype import StatefulEntityType +from toscaparser.elements.statefulentitytype import StatefulEntityType class ArtifactTypeDef(StatefulEntityType): diff --git a/translator/toscalib/elements/attribute_definition.py b/toscaparser/elements/attribute_definition.py similarity index 100% rename from translator/toscalib/elements/attribute_definition.py rename to toscaparser/elements/attribute_definition.py diff --git a/translator/toscalib/elements/capabilitytype.py b/toscaparser/elements/capabilitytype.py similarity index 94% rename from translator/toscalib/elements/capabilitytype.py rename to toscaparser/elements/capabilitytype.py index 4f8bc0a..b1f473d 100644 --- a/translator/toscalib/elements/capabilitytype.py +++ b/toscaparser/elements/capabilitytype.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from translator.toscalib.elements.property_definition import PropertyDef -from translator.toscalib.elements.statefulentitytype import StatefulEntityType +from toscaparser.elements.property_definition import PropertyDef +from toscaparser.elements.statefulentitytype import StatefulEntityType class CapabilityTypeDef(StatefulEntityType): diff --git a/translator/toscalib/elements/constraints.py b/toscaparser/elements/constraints.py similarity index 98% rename from translator/toscalib/elements/constraints.py rename to toscaparser/elements/constraints.py index c984340..3fe1976 100644 --- a/translator/toscalib/elements/constraints.py +++ b/toscaparser/elements/constraints.py @@ -14,11 +14,11 @@ import collections import datetime import re -from translator.toscalib.common.exception import InvalidSchemaError -from translator.toscalib.common.exception import ValidationError -from translator.toscalib.elements import scalarunit -from translator.toscalib.functions import is_function -from translator.toscalib.utils.gettextutils import _ +from toscaparser.common.exception import InvalidSchemaError +from toscaparser.common.exception import ValidationError +from toscaparser.elements import scalarunit +from toscaparser.functions import is_function +from toscaparser.utils.gettextutils import _ class Schema(collections.Mapping): diff --git a/translator/toscalib/elements/datatype.py b/toscaparser/elements/datatype.py similarity index 96% rename from translator/toscalib/elements/datatype.py rename to toscaparser/elements/datatype.py index 9406191..7e05a69 100644 --- a/translator/toscalib/elements/datatype.py +++ b/toscaparser/elements/datatype.py @@ -11,7 +11,7 @@ # under the License. -from translator.toscalib.elements.statefulentitytype import StatefulEntityType +from toscaparser.elements.statefulentitytype import StatefulEntityType class DataType(StatefulEntityType): diff --git a/translator/toscalib/elements/entitytype.py b/toscaparser/elements/entitytype.py similarity index 96% rename from translator/toscalib/elements/entitytype.py rename to toscaparser/elements/entitytype.py index 7ad4b9b..ea4c987 100644 --- a/translator/toscalib/elements/entitytype.py +++ b/toscaparser/elements/entitytype.py @@ -12,7 +12,7 @@ import logging import os -import translator.toscalib.utils.yamlparser +import toscaparser.utils.yamlparser log = logging.getLogger('tosca') @@ -30,7 +30,7 @@ class EntityType(object): os.path.dirname(os.path.abspath(__file__)), "TOSCA_definition_1_0.yaml") - loader = translator.toscalib.utils.yamlparser.load_yaml + loader = toscaparser.utils.yamlparser.load_yaml TOSCA_DEF = loader(TOSCA_DEF_FILE) diff --git a/translator/toscalib/elements/interfaces.py b/toscaparser/elements/interfaces.py similarity index 94% rename from translator/toscalib/elements/interfaces.py rename to toscaparser/elements/interfaces.py index 1cd5334..1d129aa 100644 --- a/translator/toscalib/elements/interfaces.py +++ b/toscaparser/elements/interfaces.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from translator.toscalib.common.exception import UnknownFieldError -from translator.toscalib.elements.statefulentitytype import StatefulEntityType +from toscaparser.common.exception import UnknownFieldError +from toscaparser.elements.statefulentitytype import StatefulEntityType SECTIONS = (LIFECYCLE, CONFIGURE, LIFECYCLE_SHORTNAME, CONFIGURE_SHORTNAME) = \ diff --git a/translator/toscalib/elements/nodetype.py b/toscaparser/elements/nodetype.py similarity index 95% rename from translator/toscalib/elements/nodetype.py rename to toscaparser/elements/nodetype.py index 400dbd7..e90ceeb 100644 --- a/translator/toscalib/elements/nodetype.py +++ b/toscaparser/elements/nodetype.py @@ -10,11 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -from translator.toscalib.elements.capabilitytype import CapabilityTypeDef -import translator.toscalib.elements.interfaces as ifaces -from translator.toscalib.elements.interfaces import InterfacesDef -from translator.toscalib.elements.relationshiptype import RelationshipType -from translator.toscalib.elements.statefulentitytype import StatefulEntityType +from toscaparser.elements.capabilitytype import CapabilityTypeDef +import toscaparser.elements.interfaces as ifaces +from toscaparser.elements.interfaces import InterfacesDef +from toscaparser.elements.relationshiptype import RelationshipType +from toscaparser.elements.statefulentitytype import StatefulEntityType class NodeType(StatefulEntityType): diff --git a/translator/toscalib/elements/property_definition.py b/toscaparser/elements/property_definition.py similarity index 95% rename from translator/toscalib/elements/property_definition.py rename to toscaparser/elements/property_definition.py index 9274776..7ff48f3 100644 --- a/translator/toscalib/elements/property_definition.py +++ b/toscaparser/elements/property_definition.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from translator.toscalib.common.exception import InvalidSchemaError +from toscaparser.common.exception import InvalidSchemaError class PropertyDef(object): diff --git a/translator/toscalib/elements/relationshiptype.py b/toscaparser/elements/relationshiptype.py similarity index 94% rename from translator/toscalib/elements/relationshiptype.py rename to toscaparser/elements/relationshiptype.py index c5ecdce..9462d38 100644 --- a/translator/toscalib/elements/relationshiptype.py +++ b/toscaparser/elements/relationshiptype.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from translator.toscalib.elements.statefulentitytype import StatefulEntityType +from toscaparser.elements.statefulentitytype import StatefulEntityType class RelationshipType(StatefulEntityType): diff --git a/translator/toscalib/elements/scalarunit.py b/toscaparser/elements/scalarunit.py similarity index 97% rename from translator/toscalib/elements/scalarunit.py rename to toscaparser/elements/scalarunit.py index 4b4a8c5..c30f489 100644 --- a/translator/toscalib/elements/scalarunit.py +++ b/toscaparser/elements/scalarunit.py @@ -13,8 +13,8 @@ import logging import re -from translator.toscalib.utils.gettextutils import _ -from translator.toscalib.utils import validateutils +from toscaparser.utils.gettextutils import _ +from toscaparser.utils import validateutils log = logging.getLogger('tosca') diff --git a/translator/toscalib/elements/statefulentitytype.py b/toscaparser/elements/statefulentitytype.py similarity index 92% rename from translator/toscalib/elements/statefulentitytype.py rename to toscaparser/elements/statefulentitytype.py index 3d91f9b..0425b6d 100644 --- a/translator/toscalib/elements/statefulentitytype.py +++ b/toscaparser/elements/statefulentitytype.py @@ -10,10 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. -from translator.toscalib.common.exception import InvalidTypeError -from translator.toscalib.elements.attribute_definition import AttributeDef -from translator.toscalib.elements.entitytype import EntityType -from translator.toscalib.elements.property_definition import PropertyDef +from toscaparser.common.exception import InvalidTypeError +from toscaparser.elements.attribute_definition import AttributeDef +from toscaparser.elements.entitytype import EntityType +from toscaparser.elements.property_definition import PropertyDef class StatefulEntityType(EntityType): diff --git a/translator/toscalib/entity_template.py b/toscaparser/entity_template.py similarity index 95% rename from translator/toscalib/entity_template.py rename to toscaparser/entity_template.py index eae5411..bc3952f 100644 --- a/translator/toscalib/entity_template.py +++ b/toscaparser/entity_template.py @@ -10,14 +10,14 @@ # License for the specific language governing permissions and limitations # under the License. -from translator.toscalib.capabilities import Capability -from translator.toscalib.common.exception import MissingRequiredFieldError -from translator.toscalib.common.exception import UnknownFieldError -from translator.toscalib.common.exception import ValidationError -from translator.toscalib.elements.interfaces import InterfacesDef -from translator.toscalib.elements.nodetype import NodeType -from translator.toscalib.elements.relationshiptype import RelationshipType -from translator.toscalib.properties import Property +from toscaparser.capabilities import Capability +from toscaparser.common.exception import MissingRequiredFieldError +from toscaparser.common.exception import UnknownFieldError +from toscaparser.common.exception import ValidationError +from toscaparser.elements.interfaces import InterfacesDef +from toscaparser.elements.nodetype import NodeType +from toscaparser.elements.relationshiptype import RelationshipType +from toscaparser.properties import Property class EntityTemplate(object): diff --git a/translator/toscalib/functions.py b/toscaparser/functions.py similarity index 98% rename from translator/toscalib/functions.py rename to toscaparser/functions.py index 63cf65a..12cf31c 100644 --- a/translator/toscalib/functions.py +++ b/toscaparser/functions.py @@ -15,8 +15,8 @@ import abc import six -from translator.toscalib.common.exception import UnknownInputError -from translator.toscalib.utils.gettextutils import _ +from toscaparser.common.exception import UnknownInputError +from toscaparser.utils.gettextutils import _ GET_PROPERTY = 'get_property' @@ -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 translator.toscalib.elements.entitytype import EntityType + from toscaparser.elements.entitytype import EntityType hosted_on_rel = EntityType.TOSCA_DEF[HOSTED_ON] for r in node_template.requirements: for requirement, target_name in r.items(): diff --git a/translator/toscalib/groups.py b/toscaparser/groups.py similarity index 100% rename from translator/toscalib/groups.py rename to toscaparser/groups.py diff --git a/translator/toscalib/nodetemplate.py b/toscaparser/nodetemplate.py similarity index 92% rename from translator/toscalib/nodetemplate.py rename to toscaparser/nodetemplate.py index ccf2e30..8d34473 100644 --- a/translator/toscalib/nodetemplate.py +++ b/toscaparser/nodetemplate.py @@ -13,17 +13,17 @@ import logging -from translator.toscalib.common.exception import TypeMismatchError -from translator.toscalib.common.exception import UnknownFieldError -from translator.toscalib.elements.interfaces import CONFIGURE -from translator.toscalib.elements.interfaces import CONFIGURE_SHORTNAME -from translator.toscalib.elements.interfaces import InterfacesDef -from translator.toscalib.elements.interfaces import LIFECYCLE -from translator.toscalib.elements.interfaces import LIFECYCLE_SHORTNAME -from translator.toscalib.elements.relationshiptype import RelationshipType -from translator.toscalib.entity_template import EntityTemplate -from translator.toscalib.relationship_template import RelationshipTemplate -from translator.toscalib.utils.gettextutils import _ +from toscaparser.common.exception import TypeMismatchError +from toscaparser.common.exception import UnknownFieldError +from toscaparser.elements.interfaces import CONFIGURE +from toscaparser.elements.interfaces import CONFIGURE_SHORTNAME +from toscaparser.elements.interfaces import InterfacesDef +from toscaparser.elements.interfaces import LIFECYCLE +from toscaparser.elements.interfaces import LIFECYCLE_SHORTNAME +from toscaparser.elements.relationshiptype import RelationshipType +from toscaparser.entity_template import EntityTemplate +from toscaparser.relationship_template import RelationshipTemplate +from toscaparser.utils.gettextutils import _ log = logging.getLogger('tosca') diff --git a/translator/toscalib/parameters.py b/toscaparser/parameters.py similarity index 89% rename from translator/toscalib/parameters.py rename to toscaparser/parameters.py index 81a78bf..7255427 100644 --- a/translator/toscalib/parameters.py +++ b/toscaparser/parameters.py @@ -13,12 +13,12 @@ import logging -from translator.toscalib.common.exception import MissingRequiredFieldError -from translator.toscalib.common.exception import UnknownFieldError -from translator.toscalib.dataentity import DataEntity -from translator.toscalib.elements.constraints import Schema -from translator.toscalib.elements.entitytype import EntityType -from translator.toscalib.utils.gettextutils import _ +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.utils.gettextutils import _ log = logging.getLogger('tosca') diff --git a/translator/toscalib/properties.py b/toscaparser/properties.py similarity index 93% rename from translator/toscalib/properties.py rename to toscaparser/properties.py index c3436d0..23c1db2 100644 --- a/translator/toscalib/properties.py +++ b/toscaparser/properties.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. -from translator.toscalib.dataentity import DataEntity -from translator.toscalib.elements.constraints import Schema -from translator.toscalib.functions import is_function +from toscaparser.dataentity import DataEntity +from toscaparser.elements.constraints import Schema +from toscaparser.functions import is_function class Property(object): diff --git a/translator/toscalib/relationship_template.py b/toscaparser/relationship_template.py similarity index 96% rename from translator/toscalib/relationship_template.py rename to toscaparser/relationship_template.py index fae46ef..d405b9c 100644 --- a/translator/toscalib/relationship_template.py +++ b/toscaparser/relationship_template.py @@ -13,8 +13,8 @@ import logging -from translator.toscalib.entity_template import EntityTemplate -from translator.toscalib.properties import Property +from toscaparser.entity_template import EntityTemplate +from toscaparser.properties import Property SECTIONS = (DERIVED_FROM, PROPERTIES, REQUIREMENTS, INTERFACES, CAPABILITIES, TYPE) = \ diff --git a/translator/toscalib/tests/__init__.py b/toscaparser/tests/__init__.py similarity index 100% rename from translator/toscalib/tests/__init__.py rename to toscaparser/tests/__init__.py diff --git a/translator/toscalib/tests/artifacts/collectd/config.py b/toscaparser/tests/artifacts/collectd/config.py similarity index 100% rename from translator/toscalib/tests/artifacts/collectd/config.py rename to toscaparser/tests/artifacts/collectd/config.py diff --git a/translator/toscalib/tests/artifacts/collectd/create.sh b/toscaparser/tests/artifacts/collectd/create.sh similarity index 100% rename from translator/toscalib/tests/artifacts/collectd/create.sh rename to toscaparser/tests/artifacts/collectd/create.sh diff --git a/translator/toscalib/tests/artifacts/collectd/start.sh b/toscaparser/tests/artifacts/collectd/start.sh similarity index 100% rename from translator/toscalib/tests/artifacts/collectd/start.sh rename to toscaparser/tests/artifacts/collectd/start.sh diff --git a/translator/toscalib/tests/artifacts/elasticsearch/create.sh b/toscaparser/tests/artifacts/elasticsearch/create.sh similarity index 100% rename from translator/toscalib/tests/artifacts/elasticsearch/create.sh rename to toscaparser/tests/artifacts/elasticsearch/create.sh diff --git a/translator/toscalib/tests/artifacts/elasticsearch/start.sh b/toscaparser/tests/artifacts/elasticsearch/start.sh similarity index 100% rename from translator/toscalib/tests/artifacts/elasticsearch/start.sh rename to toscaparser/tests/artifacts/elasticsearch/start.sh diff --git a/translator/toscalib/tests/artifacts/kibana/config.sh b/toscaparser/tests/artifacts/kibana/config.sh similarity index 100% rename from translator/toscalib/tests/artifacts/kibana/config.sh rename to toscaparser/tests/artifacts/kibana/config.sh diff --git a/translator/toscalib/tests/artifacts/kibana/create.sh b/toscaparser/tests/artifacts/kibana/create.sh similarity index 100% rename from translator/toscalib/tests/artifacts/kibana/create.sh rename to toscaparser/tests/artifacts/kibana/create.sh diff --git a/translator/toscalib/tests/artifacts/kibana/start.sh b/toscaparser/tests/artifacts/kibana/start.sh similarity index 100% rename from translator/toscalib/tests/artifacts/kibana/start.sh rename to toscaparser/tests/artifacts/kibana/start.sh diff --git a/translator/toscalib/tests/artifacts/logstash/configure_collectd.py b/toscaparser/tests/artifacts/logstash/configure_collectd.py similarity index 100% rename from translator/toscalib/tests/artifacts/logstash/configure_collectd.py rename to toscaparser/tests/artifacts/logstash/configure_collectd.py diff --git a/translator/toscalib/tests/artifacts/logstash/configure_elasticsearch.py b/toscaparser/tests/artifacts/logstash/configure_elasticsearch.py similarity index 100% rename from translator/toscalib/tests/artifacts/logstash/configure_elasticsearch.py rename to toscaparser/tests/artifacts/logstash/configure_elasticsearch.py diff --git a/translator/toscalib/tests/artifacts/logstash/configure_rsyslog.py b/toscaparser/tests/artifacts/logstash/configure_rsyslog.py similarity index 100% rename from translator/toscalib/tests/artifacts/logstash/configure_rsyslog.py rename to toscaparser/tests/artifacts/logstash/configure_rsyslog.py diff --git a/translator/toscalib/tests/artifacts/logstash/create.sh b/toscaparser/tests/artifacts/logstash/create.sh similarity index 100% rename from translator/toscalib/tests/artifacts/logstash/create.sh rename to toscaparser/tests/artifacts/logstash/create.sh diff --git a/translator/toscalib/tests/artifacts/logstash/start.sh b/toscaparser/tests/artifacts/logstash/start.sh similarity index 100% rename from translator/toscalib/tests/artifacts/logstash/start.sh rename to toscaparser/tests/artifacts/logstash/start.sh diff --git a/translator/toscalib/tests/artifacts/mongodb/config.sh b/toscaparser/tests/artifacts/mongodb/config.sh similarity index 100% rename from translator/toscalib/tests/artifacts/mongodb/config.sh rename to toscaparser/tests/artifacts/mongodb/config.sh diff --git a/translator/toscalib/tests/artifacts/mongodb/create.sh b/toscaparser/tests/artifacts/mongodb/create.sh similarity index 100% rename from translator/toscalib/tests/artifacts/mongodb/create.sh rename to toscaparser/tests/artifacts/mongodb/create.sh diff --git a/translator/toscalib/tests/artifacts/mongodb/create_database.sh b/toscaparser/tests/artifacts/mongodb/create_database.sh similarity index 100% rename from translator/toscalib/tests/artifacts/mongodb/create_database.sh rename to toscaparser/tests/artifacts/mongodb/create_database.sh diff --git a/translator/toscalib/tests/artifacts/mongodb/start.sh b/toscaparser/tests/artifacts/mongodb/start.sh similarity index 100% rename from translator/toscalib/tests/artifacts/mongodb/start.sh rename to toscaparser/tests/artifacts/mongodb/start.sh diff --git a/translator/toscalib/tests/artifacts/mysql/mysql_database_configure.sh b/toscaparser/tests/artifacts/mysql/mysql_database_configure.sh similarity index 100% rename from translator/toscalib/tests/artifacts/mysql/mysql_database_configure.sh rename to toscaparser/tests/artifacts/mysql/mysql_database_configure.sh diff --git a/translator/toscalib/tests/artifacts/mysql/mysql_dbms_configure.sh b/toscaparser/tests/artifacts/mysql/mysql_dbms_configure.sh similarity index 100% rename from translator/toscalib/tests/artifacts/mysql/mysql_dbms_configure.sh rename to toscaparser/tests/artifacts/mysql/mysql_dbms_configure.sh diff --git a/translator/toscalib/tests/artifacts/mysql/mysql_dbms_install.sh b/toscaparser/tests/artifacts/mysql/mysql_dbms_install.sh similarity index 100% rename from translator/toscalib/tests/artifacts/mysql/mysql_dbms_install.sh rename to toscaparser/tests/artifacts/mysql/mysql_dbms_install.sh diff --git a/translator/toscalib/tests/artifacts/mysql/mysql_dbms_start.sh b/toscaparser/tests/artifacts/mysql/mysql_dbms_start.sh similarity index 100% rename from translator/toscalib/tests/artifacts/mysql/mysql_dbms_start.sh rename to toscaparser/tests/artifacts/mysql/mysql_dbms_start.sh diff --git a/translator/toscalib/tests/artifacts/nodejs/config.sh b/toscaparser/tests/artifacts/nodejs/config.sh similarity index 100% rename from translator/toscalib/tests/artifacts/nodejs/config.sh rename to toscaparser/tests/artifacts/nodejs/config.sh diff --git a/translator/toscalib/tests/artifacts/nodejs/create.sh b/toscaparser/tests/artifacts/nodejs/create.sh similarity index 100% rename from translator/toscalib/tests/artifacts/nodejs/create.sh rename to toscaparser/tests/artifacts/nodejs/create.sh diff --git a/translator/toscalib/tests/artifacts/nodejs/start.sh b/toscaparser/tests/artifacts/nodejs/start.sh similarity index 100% rename from translator/toscalib/tests/artifacts/nodejs/start.sh rename to toscaparser/tests/artifacts/nodejs/start.sh diff --git a/translator/toscalib/tests/artifacts/rsyslog/config.sh b/toscaparser/tests/artifacts/rsyslog/config.sh similarity index 100% rename from translator/toscalib/tests/artifacts/rsyslog/config.sh rename to toscaparser/tests/artifacts/rsyslog/config.sh diff --git a/translator/toscalib/tests/artifacts/rsyslog/create.sh b/toscaparser/tests/artifacts/rsyslog/create.sh similarity index 100% rename from translator/toscalib/tests/artifacts/rsyslog/create.sh rename to toscaparser/tests/artifacts/rsyslog/create.sh diff --git a/translator/toscalib/tests/artifacts/rsyslog/start.sh b/toscaparser/tests/artifacts/rsyslog/start.sh similarity index 100% rename from translator/toscalib/tests/artifacts/rsyslog/start.sh rename to toscaparser/tests/artifacts/rsyslog/start.sh diff --git a/translator/toscalib/tests/artifacts/webserver/webserver_install.sh b/toscaparser/tests/artifacts/webserver/webserver_install.sh similarity index 100% rename from translator/toscalib/tests/artifacts/webserver/webserver_install.sh rename to toscaparser/tests/artifacts/webserver/webserver_install.sh diff --git a/translator/toscalib/tests/artifacts/webserver/webserver_start.sh b/toscaparser/tests/artifacts/webserver/webserver_start.sh similarity index 100% rename from translator/toscalib/tests/artifacts/webserver/webserver_start.sh rename to toscaparser/tests/artifacts/webserver/webserver_start.sh diff --git a/translator/toscalib/tests/artifacts/wordpress/wordpress_configure.sh b/toscaparser/tests/artifacts/wordpress/wordpress_configure.sh similarity index 100% rename from translator/toscalib/tests/artifacts/wordpress/wordpress_configure.sh rename to toscaparser/tests/artifacts/wordpress/wordpress_configure.sh diff --git a/translator/toscalib/tests/artifacts/wordpress/wordpress_install.sh b/toscaparser/tests/artifacts/wordpress/wordpress_install.sh similarity index 100% rename from translator/toscalib/tests/artifacts/wordpress/wordpress_install.sh rename to toscaparser/tests/artifacts/wordpress/wordpress_install.sh diff --git a/translator/toscalib/tests/base.py b/toscaparser/tests/base.py similarity index 97% rename from translator/toscalib/tests/base.py rename to toscaparser/tests/base.py index 3844db0..f6ff8d1 100644 --- a/translator/toscalib/tests/base.py +++ b/toscaparser/tests/base.py @@ -21,7 +21,7 @@ import fixtures import testscenarios import testtools -from translator.toscalib.tosca_template import ToscaTemplate +from toscaparser.tosca_template import ToscaTemplate _TRUE_VALUES = ('True', 'true', '1', 'yes') diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/collectd.yaml b/toscaparser/tests/data/CSAR/tosca_elk/Definitions/collectd.yaml similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/collectd.yaml rename to toscaparser/tests/data/CSAR/tosca_elk/Definitions/collectd.yaml diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/elasticsearch.yaml b/toscaparser/tests/data/CSAR/tosca_elk/Definitions/elasticsearch.yaml similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/elasticsearch.yaml rename to toscaparser/tests/data/CSAR/tosca_elk/Definitions/elasticsearch.yaml diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/kibana.yaml b/toscaparser/tests/data/CSAR/tosca_elk/Definitions/kibana.yaml similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/kibana.yaml rename to toscaparser/tests/data/CSAR/tosca_elk/Definitions/kibana.yaml diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/logstash.yaml b/toscaparser/tests/data/CSAR/tosca_elk/Definitions/logstash.yaml similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/logstash.yaml rename to toscaparser/tests/data/CSAR/tosca_elk/Definitions/logstash.yaml diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/paypalpizzastore_nodejs_app.yaml b/toscaparser/tests/data/CSAR/tosca_elk/Definitions/paypalpizzastore_nodejs_app.yaml similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/paypalpizzastore_nodejs_app.yaml rename to toscaparser/tests/data/CSAR/tosca_elk/Definitions/paypalpizzastore_nodejs_app.yaml diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/rsyslog.yaml b/toscaparser/tests/data/CSAR/tosca_elk/Definitions/rsyslog.yaml similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/rsyslog.yaml rename to toscaparser/tests/data/CSAR/tosca_elk/Definitions/rsyslog.yaml diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/tosca_elk.yaml b/toscaparser/tests/data/CSAR/tosca_elk/Definitions/tosca_elk.yaml similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/tosca_elk.yaml rename to toscaparser/tests/data/CSAR/tosca_elk/Definitions/tosca_elk.yaml diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Python/collectd/config.py b/toscaparser/tests/data/CSAR/tosca_elk/Python/collectd/config.py similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Python/collectd/config.py rename to toscaparser/tests/data/CSAR/tosca_elk/Python/collectd/config.py diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Python/logstash/configure_collectd.py b/toscaparser/tests/data/CSAR/tosca_elk/Python/logstash/configure_collectd.py similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Python/logstash/configure_collectd.py rename to toscaparser/tests/data/CSAR/tosca_elk/Python/logstash/configure_collectd.py diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Python/logstash/configure_elasticsearch.py b/toscaparser/tests/data/CSAR/tosca_elk/Python/logstash/configure_elasticsearch.py similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Python/logstash/configure_elasticsearch.py rename to toscaparser/tests/data/CSAR/tosca_elk/Python/logstash/configure_elasticsearch.py diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Python/logstash/configure_rsyslog.py b/toscaparser/tests/data/CSAR/tosca_elk/Python/logstash/configure_rsyslog.py similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Python/logstash/configure_rsyslog.py rename to toscaparser/tests/data/CSAR/tosca_elk/Python/logstash/configure_rsyslog.py diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/README.txt b/toscaparser/tests/data/CSAR/tosca_elk/README.txt similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/README.txt rename to toscaparser/tests/data/CSAR/tosca_elk/README.txt diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/collectd/create.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/collectd/create.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/collectd/create.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/collectd/create.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/collectd/start.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/collectd/start.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/collectd/start.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/collectd/start.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/create.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/create.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/create.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/create.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/start.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/start.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/start.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/start.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/kibana/config.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/kibana/config.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/kibana/config.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/kibana/config.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/kibana/create.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/kibana/create.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/kibana/create.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/kibana/create.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/kibana/start.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/kibana/start.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/kibana/start.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/kibana/start.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/logstash/create.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/logstash/create.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/logstash/create.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/logstash/create.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/logstash/start.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/logstash/start.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/logstash/start.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/logstash/start.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/mongodb/config.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/config.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/mongodb/config.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/config.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/mongodb/create.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/create.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/mongodb/create.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/create.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/mongodb/create_database.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/create_database.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/mongodb/create_database.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/create_database.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/mongodb/start.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/start.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/mongodb/start.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/start.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/nodejs/config.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/nodejs/config.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/nodejs/config.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/nodejs/config.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/nodejs/create.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/nodejs/create.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/nodejs/create.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/nodejs/create.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/nodejs/start.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/nodejs/start.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/nodejs/start.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/nodejs/start.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/rsyslog/config.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/rsyslog/config.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/rsyslog/config.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/rsyslog/config.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/rsyslog/create.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/rsyslog/create.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/rsyslog/create.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/rsyslog/create.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/rsyslog/start.sh b/toscaparser/tests/data/CSAR/tosca_elk/Scripts/rsyslog/start.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/rsyslog/start.sh rename to toscaparser/tests/data/CSAR/tosca_elk/Scripts/rsyslog/start.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/TOSCA-Metadata/TOSCA.meta b/toscaparser/tests/data/CSAR/tosca_elk/TOSCA-Metadata/TOSCA.meta similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_elk/TOSCA-Metadata/TOSCA.meta rename to toscaparser/tests/data/CSAR/tosca_elk/TOSCA-Metadata/TOSCA.meta diff --git a/translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Definitions/tosca_single_instance_wordpress.yaml b/toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Definitions/tosca_single_instance_wordpress.yaml similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Definitions/tosca_single_instance_wordpress.yaml rename to toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Definitions/tosca_single_instance_wordpress.yaml diff --git a/translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Definitions/wordpress.yaml b/toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Definitions/wordpress.yaml similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Definitions/wordpress.yaml rename to toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Definitions/wordpress.yaml diff --git a/translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/README.txt b/toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/README.txt similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/README.txt rename to toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/README.txt diff --git a/translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/MYSQLDBMS/configure.sh b/toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/MYSQLDBMS/configure.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/MYSQLDBMS/configure.sh rename to toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/MYSQLDBMS/configure.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/MYSQLDBMS/install.sh b/toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/MYSQLDBMS/install.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/MYSQLDBMS/install.sh rename to toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/MYSQLDBMS/install.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/MYSQLDBMS/start.sh b/toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/MYSQLDBMS/start.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/MYSQLDBMS/start.sh rename to toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/MYSQLDBMS/start.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/MYSQLDatabase/configure.sh b/toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/MYSQLDatabase/configure.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/MYSQLDatabase/configure.sh rename to toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/MYSQLDatabase/configure.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/WebServer/install.sh b/toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/WebServer/install.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/WebServer/install.sh rename to toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/WebServer/install.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/WebServer/start.sh b/toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/WebServer/start.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/WebServer/start.sh rename to toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/WebServer/start.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/WordPress/configure.sh b/toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/WordPress/configure.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/WordPress/configure.sh rename to toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/WordPress/configure.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/WordPress/install.sh b/toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/WordPress/install.sh similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/WordPress/install.sh rename to toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/Scripts/WordPress/install.sh diff --git a/translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/TOSCA-Metadata/TOSCA.meta b/toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/TOSCA-Metadata/TOSCA.meta similarity index 100% rename from translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/TOSCA-Metadata/TOSCA.meta rename to toscaparser/tests/data/CSAR/tosca_single_instance_wordpress/TOSCA-Metadata/TOSCA.meta diff --git a/translator/toscalib/tests/data/custom_types/collectd.yaml b/toscaparser/tests/data/custom_types/collectd.yaml similarity index 100% rename from translator/toscalib/tests/data/custom_types/collectd.yaml rename to toscaparser/tests/data/custom_types/collectd.yaml diff --git a/translator/toscalib/tests/data/custom_types/elasticsearch.yaml b/toscaparser/tests/data/custom_types/elasticsearch.yaml similarity index 100% rename from translator/toscalib/tests/data/custom_types/elasticsearch.yaml rename to toscaparser/tests/data/custom_types/elasticsearch.yaml diff --git a/translator/toscalib/tests/data/custom_types/kibana.yaml b/toscaparser/tests/data/custom_types/kibana.yaml similarity index 100% rename from translator/toscalib/tests/data/custom_types/kibana.yaml rename to toscaparser/tests/data/custom_types/kibana.yaml diff --git a/translator/toscalib/tests/data/custom_types/logstash.yaml b/toscaparser/tests/data/custom_types/logstash.yaml similarity index 100% rename from translator/toscalib/tests/data/custom_types/logstash.yaml rename to toscaparser/tests/data/custom_types/logstash.yaml diff --git a/translator/toscalib/tests/data/custom_types/paypalpizzastore_nodejs_app.yaml b/toscaparser/tests/data/custom_types/paypalpizzastore_nodejs_app.yaml similarity index 100% rename from translator/toscalib/tests/data/custom_types/paypalpizzastore_nodejs_app.yaml rename to toscaparser/tests/data/custom_types/paypalpizzastore_nodejs_app.yaml diff --git a/translator/toscalib/tests/data/custom_types/rsyslog.yaml b/toscaparser/tests/data/custom_types/rsyslog.yaml similarity index 100% rename from translator/toscalib/tests/data/custom_types/rsyslog.yaml rename to toscaparser/tests/data/custom_types/rsyslog.yaml diff --git a/translator/toscalib/tests/data/custom_types/wordpress.yaml b/toscaparser/tests/data/custom_types/wordpress.yaml similarity index 100% rename from translator/toscalib/tests/data/custom_types/wordpress.yaml rename to toscaparser/tests/data/custom_types/wordpress.yaml diff --git a/translator/toscalib/tests/data/datatypes/custom_datatype_def.yaml b/toscaparser/tests/data/datatypes/custom_datatype_def.yaml similarity index 100% rename from translator/toscalib/tests/data/datatypes/custom_datatype_def.yaml rename to toscaparser/tests/data/datatypes/custom_datatype_def.yaml diff --git a/translator/toscalib/tests/data/datatypes/test_custom_datatypes_in_current_template.yaml b/toscaparser/tests/data/datatypes/test_custom_datatypes_in_current_template.yaml similarity index 100% rename from translator/toscalib/tests/data/datatypes/test_custom_datatypes_in_current_template.yaml rename to toscaparser/tests/data/datatypes/test_custom_datatypes_in_current_template.yaml diff --git a/translator/toscalib/tests/data/datatypes/test_custom_datatypes_nested_datatype_error.yaml b/toscaparser/tests/data/datatypes/test_custom_datatypes_nested_datatype_error.yaml similarity index 100% rename from translator/toscalib/tests/data/datatypes/test_custom_datatypes_nested_datatype_error.yaml rename to toscaparser/tests/data/datatypes/test_custom_datatypes_nested_datatype_error.yaml diff --git a/translator/toscalib/tests/data/datatypes/test_custom_datatypes_positive.yaml b/toscaparser/tests/data/datatypes/test_custom_datatypes_positive.yaml similarity index 100% rename from translator/toscalib/tests/data/datatypes/test_custom_datatypes_positive.yaml rename to toscaparser/tests/data/datatypes/test_custom_datatypes_positive.yaml diff --git a/translator/toscalib/tests/data/datatypes/test_custom_datatypes_value_error.yaml b/toscaparser/tests/data/datatypes/test_custom_datatypes_value_error.yaml similarity index 100% rename from translator/toscalib/tests/data/datatypes/test_custom_datatypes_value_error.yaml rename to toscaparser/tests/data/datatypes/test_custom_datatypes_value_error.yaml diff --git a/translator/toscalib/tests/data/functions/test_get_attribute_host_keyword.yaml b/toscaparser/tests/data/functions/test_get_attribute_host_keyword.yaml similarity index 100% rename from translator/toscalib/tests/data/functions/test_get_attribute_host_keyword.yaml rename to toscaparser/tests/data/functions/test_get_attribute_host_keyword.yaml diff --git a/translator/toscalib/tests/data/functions/test_get_attribute_host_not_found.yaml b/toscaparser/tests/data/functions/test_get_attribute_host_not_found.yaml similarity index 100% rename from translator/toscalib/tests/data/functions/test_get_attribute_host_not_found.yaml rename to toscaparser/tests/data/functions/test_get_attribute_host_not_found.yaml diff --git a/translator/toscalib/tests/data/functions/test_get_attribute_illegal_host_in_outputs.yaml b/toscaparser/tests/data/functions/test_get_attribute_illegal_host_in_outputs.yaml similarity index 100% rename from translator/toscalib/tests/data/functions/test_get_attribute_illegal_host_in_outputs.yaml rename to toscaparser/tests/data/functions/test_get_attribute_illegal_host_in_outputs.yaml diff --git a/translator/toscalib/tests/data/functions/test_get_attribute_unknown_attribute_name.yaml b/toscaparser/tests/data/functions/test_get_attribute_unknown_attribute_name.yaml similarity index 100% rename from translator/toscalib/tests/data/functions/test_get_attribute_unknown_attribute_name.yaml rename to toscaparser/tests/data/functions/test_get_attribute_unknown_attribute_name.yaml diff --git a/translator/toscalib/tests/data/functions/test_get_attribute_unknown_node_template_name.yaml b/toscaparser/tests/data/functions/test_get_attribute_unknown_node_template_name.yaml similarity index 100% rename from translator/toscalib/tests/data/functions/test_get_attribute_unknown_node_template_name.yaml rename to toscaparser/tests/data/functions/test_get_attribute_unknown_node_template_name.yaml diff --git a/translator/toscalib/tests/data/functions/test_invalid_function_signature.yaml b/toscaparser/tests/data/functions/test_invalid_function_signature.yaml similarity index 100% rename from translator/toscalib/tests/data/functions/test_invalid_function_signature.yaml rename to toscaparser/tests/data/functions/test_invalid_function_signature.yaml diff --git a/translator/toscalib/tests/data/functions/test_unknown_capability_property.yaml b/toscaparser/tests/data/functions/test_unknown_capability_property.yaml similarity index 100% rename from translator/toscalib/tests/data/functions/test_unknown_capability_property.yaml rename to toscaparser/tests/data/functions/test_unknown_capability_property.yaml diff --git a/translator/toscalib/tests/data/functions/test_unknown_input_in_interface.yaml b/toscaparser/tests/data/functions/test_unknown_input_in_interface.yaml similarity index 100% rename from translator/toscalib/tests/data/functions/test_unknown_input_in_interface.yaml rename to toscaparser/tests/data/functions/test_unknown_input_in_interface.yaml diff --git a/translator/toscalib/tests/data/functions/test_unknown_input_in_property.yaml b/toscaparser/tests/data/functions/test_unknown_input_in_property.yaml similarity index 100% rename from translator/toscalib/tests/data/functions/test_unknown_input_in_property.yaml rename to toscaparser/tests/data/functions/test_unknown_input_in_property.yaml diff --git a/translator/toscalib/tests/data/hot_output/hot_elk.yaml b/toscaparser/tests/data/hot_output/hot_elk.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/hot_elk.yaml rename to toscaparser/tests/data/hot_output/hot_elk.yaml diff --git a/translator/toscalib/tests/data/hot_output/hot_host_assignment.yaml b/toscaparser/tests/data/hot_output/hot_host_assignment.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/hot_host_assignment.yaml rename to toscaparser/tests/data/hot_output/hot_host_assignment.yaml diff --git a/translator/toscalib/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml b/toscaparser/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml rename to toscaparser/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml diff --git a/translator/toscalib/tests/data/hot_output/hot_single_instance_wordpress.yaml b/toscaparser/tests/data/hot_output/hot_single_instance_wordpress.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/hot_single_instance_wordpress.yaml rename to toscaparser/tests/data/hot_output/hot_single_instance_wordpress.yaml diff --git a/translator/toscalib/tests/data/hot_output/hot_single_object_store.yaml b/toscaparser/tests/data/hot_output/hot_single_object_store.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/hot_single_object_store.yaml rename to toscaparser/tests/data/hot_output/hot_single_object_store.yaml diff --git a/translator/toscalib/tests/data/hot_output/hot_single_server.yaml b/toscaparser/tests/data/hot_output/hot_single_server.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/hot_single_server.yaml rename to toscaparser/tests/data/hot_output/hot_single_server.yaml diff --git a/translator/toscalib/tests/data/hot_output/hot_software_component.yaml b/toscaparser/tests/data/hot_output/hot_software_component.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/hot_software_component.yaml rename to toscaparser/tests/data/hot_output/hot_software_component.yaml diff --git a/translator/toscalib/tests/data/hot_output/hot_tosca_helloworld.yaml b/toscaparser/tests/data/hot_output/hot_tosca_helloworld.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/hot_tosca_helloworld.yaml rename to toscaparser/tests/data/hot_output/hot_tosca_helloworld.yaml diff --git a/translator/toscalib/tests/data/hot_output/hot_web_application.yaml b/toscaparser/tests/data/hot_output/hot_web_application.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/hot_web_application.yaml rename to toscaparser/tests/data/hot_output/hot_web_application.yaml diff --git a/translator/toscalib/tests/data/hot_output/network/hot_one_server_one_network.yaml b/toscaparser/tests/data/hot_output/network/hot_one_server_one_network.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/network/hot_one_server_one_network.yaml rename to toscaparser/tests/data/hot_output/network/hot_one_server_one_network.yaml diff --git a/translator/toscalib/tests/data/hot_output/network/hot_one_server_three_networks.yaml b/toscaparser/tests/data/hot_output/network/hot_one_server_three_networks.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/network/hot_one_server_three_networks.yaml rename to toscaparser/tests/data/hot_output/network/hot_one_server_three_networks.yaml diff --git a/translator/toscalib/tests/data/hot_output/network/hot_server_on_existing_network.yaml b/toscaparser/tests/data/hot_output/network/hot_server_on_existing_network.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/network/hot_server_on_existing_network.yaml rename to toscaparser/tests/data/hot_output/network/hot_server_on_existing_network.yaml diff --git a/translator/toscalib/tests/data/hot_output/network/hot_two_servers_one_network.yaml b/toscaparser/tests/data/hot_output/network/hot_two_servers_one_network.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/network/hot_two_servers_one_network.yaml rename to toscaparser/tests/data/hot_output/network/hot_two_servers_one_network.yaml diff --git a/translator/toscalib/tests/data/hot_output/storage/hot_blockstorage_with_attachment.yaml b/toscaparser/tests/data/hot_output/storage/hot_blockstorage_with_attachment.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/storage/hot_blockstorage_with_attachment.yaml rename to toscaparser/tests/data/hot_output/storage/hot_blockstorage_with_attachment.yaml diff --git a/translator/toscalib/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt1.yaml b/toscaparser/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt1.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt1.yaml rename to toscaparser/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt1.yaml diff --git a/translator/toscalib/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt2.yaml b/toscaparser/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt2.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt2.yaml rename to toscaparser/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt2.yaml diff --git a/translator/toscalib/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt1.yaml b/toscaparser/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt1.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt1.yaml rename to toscaparser/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt1.yaml diff --git a/translator/toscalib/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt2.yaml b/toscaparser/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt2.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt2.yaml rename to toscaparser/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt2.yaml diff --git a/translator/toscalib/tests/data/hot_output/storage/hot_blockstorage_with_custom_relationship_type.yaml b/toscaparser/tests/data/hot_output/storage/hot_blockstorage_with_custom_relationship_type.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/storage/hot_blockstorage_with_custom_relationship_type.yaml rename to toscaparser/tests/data/hot_output/storage/hot_blockstorage_with_custom_relationship_type.yaml diff --git a/translator/toscalib/tests/data/hot_output/storage/hot_blockstorage_with_relationship_template.yaml b/toscaparser/tests/data/hot_output/storage/hot_blockstorage_with_relationship_template.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/storage/hot_blockstorage_with_relationship_template.yaml rename to toscaparser/tests/data/hot_output/storage/hot_blockstorage_with_relationship_template.yaml diff --git a/translator/toscalib/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt1.yaml b/toscaparser/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt1.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt1.yaml rename to toscaparser/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt1.yaml diff --git a/translator/toscalib/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt2.yaml b/toscaparser/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt2.yaml similarity index 100% rename from translator/toscalib/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt2.yaml rename to toscaparser/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt2.yaml diff --git a/translator/toscalib/tests/data/network/tosca_one_server_one_network.yaml b/toscaparser/tests/data/network/tosca_one_server_one_network.yaml similarity index 100% rename from translator/toscalib/tests/data/network/tosca_one_server_one_network.yaml rename to toscaparser/tests/data/network/tosca_one_server_one_network.yaml diff --git a/translator/toscalib/tests/data/network/tosca_one_server_three_networks.yaml b/toscaparser/tests/data/network/tosca_one_server_three_networks.yaml similarity index 100% rename from translator/toscalib/tests/data/network/tosca_one_server_three_networks.yaml rename to toscaparser/tests/data/network/tosca_one_server_three_networks.yaml diff --git a/translator/toscalib/tests/data/network/tosca_server_on_existing_network.yaml b/toscaparser/tests/data/network/tosca_server_on_existing_network.yaml similarity index 100% rename from translator/toscalib/tests/data/network/tosca_server_on_existing_network.yaml rename to toscaparser/tests/data/network/tosca_server_on_existing_network.yaml diff --git a/translator/toscalib/tests/data/network/tosca_two_servers_one_network.yaml b/toscaparser/tests/data/network/tosca_two_servers_one_network.yaml similarity index 100% rename from translator/toscalib/tests/data/network/tosca_two_servers_one_network.yaml rename to toscaparser/tests/data/network/tosca_two_servers_one_network.yaml diff --git a/translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment.yaml b/toscaparser/tests/data/storage/tosca_blockstorage_with_attachment.yaml similarity index 100% rename from translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment.yaml rename to toscaparser/tests/data/storage/tosca_blockstorage_with_attachment.yaml diff --git a/translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment_notation1.yaml b/toscaparser/tests/data/storage/tosca_blockstorage_with_attachment_notation1.yaml similarity index 100% rename from translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment_notation1.yaml rename to toscaparser/tests/data/storage/tosca_blockstorage_with_attachment_notation1.yaml diff --git a/translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment_notation2.yaml b/toscaparser/tests/data/storage/tosca_blockstorage_with_attachment_notation2.yaml similarity index 100% rename from translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment_notation2.yaml rename to toscaparser/tests/data/storage/tosca_blockstorage_with_attachment_notation2.yaml diff --git a/translator/toscalib/tests/data/storage/tosca_blockstorage_with_custom_relationship_type.yaml b/toscaparser/tests/data/storage/tosca_blockstorage_with_custom_relationship_type.yaml similarity index 100% rename from translator/toscalib/tests/data/storage/tosca_blockstorage_with_custom_relationship_type.yaml rename to toscaparser/tests/data/storage/tosca_blockstorage_with_custom_relationship_type.yaml diff --git a/translator/toscalib/tests/data/storage/tosca_blockstorage_with_relationship_template.yaml b/toscaparser/tests/data/storage/tosca_blockstorage_with_relationship_template.yaml similarity index 100% rename from translator/toscalib/tests/data/storage/tosca_blockstorage_with_relationship_template.yaml rename to toscaparser/tests/data/storage/tosca_blockstorage_with_relationship_template.yaml diff --git a/translator/toscalib/tests/data/storage/tosca_multiple_blockstorage_with_attachment.yaml b/toscaparser/tests/data/storage/tosca_multiple_blockstorage_with_attachment.yaml similarity index 100% rename from translator/toscalib/tests/data/storage/tosca_multiple_blockstorage_with_attachment.yaml rename to toscaparser/tests/data/storage/tosca_multiple_blockstorage_with_attachment.yaml diff --git a/translator/toscalib/tests/data/storage/tosca_single_object_store.yaml b/toscaparser/tests/data/storage/tosca_single_object_store.yaml similarity index 100% rename from translator/toscalib/tests/data/storage/tosca_single_object_store.yaml rename to toscaparser/tests/data/storage/tosca_single_object_store.yaml diff --git a/translator/toscalib/tests/data/test_host_assignment.yaml b/toscaparser/tests/data/test_host_assignment.yaml similarity index 100% rename from translator/toscalib/tests/data/test_host_assignment.yaml rename to toscaparser/tests/data/test_host_assignment.yaml diff --git a/translator/toscalib/tests/data/test_invalid_template_version.yaml b/toscaparser/tests/data/test_invalid_template_version.yaml similarity index 100% rename from translator/toscalib/tests/data/test_invalid_template_version.yaml rename to toscaparser/tests/data/test_invalid_template_version.yaml diff --git a/translator/toscalib/tests/data/test_no_inputs_in_template.yaml b/toscaparser/tests/data/test_no_inputs_in_template.yaml similarity index 100% rename from translator/toscalib/tests/data/test_no_inputs_in_template.yaml rename to toscaparser/tests/data/test_no_inputs_in_template.yaml diff --git a/translator/toscalib/tests/data/test_no_outputs_in_template.yaml b/toscaparser/tests/data/test_no_outputs_in_template.yaml similarity index 100% rename from translator/toscalib/tests/data/test_no_outputs_in_template.yaml rename to toscaparser/tests/data/test_no_outputs_in_template.yaml diff --git a/translator/toscalib/tests/data/test_requirements.yaml b/toscaparser/tests/data/test_requirements.yaml similarity index 100% rename from translator/toscalib/tests/data/test_requirements.yaml rename to toscaparser/tests/data/test_requirements.yaml diff --git a/translator/toscalib/tests/data/test_tosca_normative_type_by_shortname.yaml b/toscaparser/tests/data/test_tosca_normative_type_by_shortname.yaml similarity index 100% rename from translator/toscalib/tests/data/test_tosca_normative_type_by_shortname.yaml rename to toscaparser/tests/data/test_tosca_normative_type_by_shortname.yaml diff --git a/translator/toscalib/tests/data/test_tosca_top_level_error1.yaml b/toscaparser/tests/data/test_tosca_top_level_error1.yaml similarity index 100% rename from translator/toscalib/tests/data/test_tosca_top_level_error1.yaml rename to toscaparser/tests/data/test_tosca_top_level_error1.yaml diff --git a/translator/toscalib/tests/data/test_tosca_top_level_error2.yaml b/toscaparser/tests/data/test_tosca_top_level_error2.yaml similarity index 100% rename from translator/toscalib/tests/data/test_tosca_top_level_error2.yaml rename to toscaparser/tests/data/test_tosca_top_level_error2.yaml diff --git a/translator/toscalib/tests/data/topology_template/definitions.yaml b/toscaparser/tests/data/topology_template/definitions.yaml similarity index 100% rename from translator/toscalib/tests/data/topology_template/definitions.yaml rename to toscaparser/tests/data/topology_template/definitions.yaml diff --git a/translator/toscalib/tests/data/topology_template/subsystem.yaml b/toscaparser/tests/data/topology_template/subsystem.yaml similarity index 100% rename from translator/toscalib/tests/data/topology_template/subsystem.yaml rename to toscaparser/tests/data/topology_template/subsystem.yaml diff --git a/translator/toscalib/tests/data/topology_template/system.yaml b/toscaparser/tests/data/topology_template/system.yaml similarity index 100% rename from translator/toscalib/tests/data/topology_template/system.yaml rename to toscaparser/tests/data/topology_template/system.yaml diff --git a/translator/toscalib/tests/data/tosca_elk.yaml b/toscaparser/tests/data/tosca_elk.yaml similarity index 100% rename from translator/toscalib/tests/data/tosca_elk.yaml rename to toscaparser/tests/data/tosca_elk.yaml diff --git a/translator/toscalib/tests/data/tosca_helloworld.yaml b/toscaparser/tests/data/tosca_helloworld.yaml similarity index 100% rename from translator/toscalib/tests/data/tosca_helloworld.yaml rename to toscaparser/tests/data/tosca_helloworld.yaml diff --git a/translator/toscalib/tests/data/tosca_nodejs_mongodb_two_instances.yaml b/toscaparser/tests/data/tosca_nodejs_mongodb_two_instances.yaml similarity index 100% rename from translator/toscalib/tests/data/tosca_nodejs_mongodb_two_instances.yaml rename to toscaparser/tests/data/tosca_nodejs_mongodb_two_instances.yaml diff --git a/translator/toscalib/tests/data/tosca_single_instance_wordpress.yaml b/toscaparser/tests/data/tosca_single_instance_wordpress.yaml similarity index 100% rename from translator/toscalib/tests/data/tosca_single_instance_wordpress.yaml rename to toscaparser/tests/data/tosca_single_instance_wordpress.yaml diff --git a/translator/toscalib/tests/data/tosca_single_server.yaml b/toscaparser/tests/data/tosca_single_server.yaml similarity index 100% rename from translator/toscalib/tests/data/tosca_single_server.yaml rename to toscaparser/tests/data/tosca_single_server.yaml diff --git a/translator/toscalib/tests/data/tosca_software_component.yaml b/toscaparser/tests/data/tosca_software_component.yaml similarity index 100% rename from translator/toscalib/tests/data/tosca_software_component.yaml rename to toscaparser/tests/data/tosca_software_component.yaml diff --git a/translator/toscalib/tests/data/tosca_web_application.yaml b/toscaparser/tests/data/tosca_web_application.yaml similarity index 100% rename from translator/toscalib/tests/data/tosca_web_application.yaml rename to toscaparser/tests/data/tosca_web_application.yaml diff --git a/translator/toscalib/tests/test_constraints.py b/toscaparser/tests/test_constraints.py similarity index 98% rename from translator/toscalib/tests/test_constraints.py rename to toscaparser/tests/test_constraints.py index 5ee4034..784ff5b 100644 --- a/translator/toscalib/tests/test_constraints.py +++ b/toscaparser/tests/test_constraints.py @@ -13,11 +13,11 @@ import datetime import yaml -from translator.toscalib.common import exception -from translator.toscalib.elements.constraints import Constraint -from translator.toscalib.elements.constraints import Schema -from translator.toscalib.tests.base import TestCase -from translator.toscalib.utils import yamlparser +from toscaparser.common import exception +from toscaparser.elements.constraints import Constraint +from toscaparser.elements.constraints import Schema +from toscaparser.tests.base import TestCase +from toscaparser.utils import yamlparser class ConstraintTest(TestCase): diff --git a/translator/toscalib/tests/test_datatypes.py b/toscaparser/tests/test_datatypes.py similarity index 96% rename from translator/toscalib/tests/test_datatypes.py rename to toscaparser/tests/test_datatypes.py index 506e2c6..f5dcd9b 100644 --- a/translator/toscalib/tests/test_datatypes.py +++ b/toscaparser/tests/test_datatypes.py @@ -13,13 +13,13 @@ import os from testtools.testcase import skip -from translator.toscalib.common import exception -from translator.toscalib.dataentity import DataEntity -from translator.toscalib.elements.datatype import DataType -from translator.toscalib.parameters import Input -from translator.toscalib.tests.base import TestCase -from translator.toscalib.tosca_template import ToscaTemplate -from translator.toscalib.utils import yamlparser +from toscaparser.common import exception +from toscaparser.dataentity import DataEntity +from toscaparser.elements.datatype import DataType +from toscaparser.parameters import Input +from toscaparser.tests.base import TestCase +from toscaparser.tosca_template import ToscaTemplate +from toscaparser.utils import yamlparser class DataTypeTest(TestCase): diff --git a/translator/toscalib/tests/test_exception.py b/toscaparser/tests/test_exception.py similarity index 94% rename from translator/toscalib/tests/test_exception.py rename to toscaparser/tests/test_exception.py index dfdd776..0ce8e13 100644 --- a/translator/toscalib/tests/test_exception.py +++ b/toscaparser/tests/test_exception.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from translator.toscalib.common import exception -from translator.toscalib.tests.base import TestCase +from toscaparser.common import exception +from toscaparser.tests.base import TestCase class ExceptionTest(TestCase): diff --git a/translator/toscalib/tests/test_functions.py b/toscaparser/tests/test_functions.py similarity index 97% rename from translator/toscalib/tests/test_functions.py rename to toscaparser/tests/test_functions.py index f1f2877..268d54b 100644 --- a/translator/toscalib/tests/test_functions.py +++ b/toscaparser/tests/test_functions.py @@ -12,10 +12,10 @@ import os import six -from translator.toscalib.common import exception -from translator.toscalib import functions -from translator.toscalib.tests.base import TestCase -from translator.toscalib.tosca_template import ToscaTemplate +from toscaparser.common import exception +from toscaparser import functions +from toscaparser.tests.base import TestCase +from toscaparser.tosca_template import ToscaTemplate class IntrinsicFunctionsTest(TestCase): diff --git a/translator/toscalib/tests/test_properties.py b/toscaparser/tests/test_properties.py similarity index 97% rename from translator/toscalib/tests/test_properties.py rename to toscaparser/tests/test_properties.py index d5e971e..ec7dfcb 100644 --- a/translator/toscalib/tests/test_properties.py +++ b/toscaparser/tests/test_properties.py @@ -10,10 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. -from translator.toscalib.common import exception -from translator.toscalib.properties import Property -from translator.toscalib.tests.base import TestCase -from translator.toscalib.utils import yamlparser +from toscaparser.common import exception +from toscaparser.properties import Property +from toscaparser.tests.base import TestCase +from toscaparser.utils import yamlparser class PropertyTest(TestCase): diff --git a/translator/toscalib/tests/test_scalarunit.py b/toscaparser/tests/test_scalarunit.py similarity index 96% rename from translator/toscalib/tests/test_scalarunit.py rename to toscaparser/tests/test_scalarunit.py index 96e14fc..ae9be2b 100644 --- a/translator/toscalib/tests/test_scalarunit.py +++ b/toscaparser/tests/test_scalarunit.py @@ -10,13 +10,13 @@ # License for the specific language governing permissions and limitations # under the License. -from translator.toscalib.common import exception -from translator.toscalib.elements.scalarunit import ScalarUnit_Frequency -from translator.toscalib.elements.scalarunit import ScalarUnit_Size -from translator.toscalib.elements.scalarunit import ScalarUnit_Time -from translator.toscalib.nodetemplate import NodeTemplate -from translator.toscalib.tests.base import TestCase -from translator.toscalib.utils import yamlparser +from toscaparser.common import exception +from toscaparser.elements.scalarunit import ScalarUnit_Frequency +from toscaparser.elements.scalarunit import ScalarUnit_Size +from toscaparser.elements.scalarunit import ScalarUnit_Time +from toscaparser.nodetemplate import NodeTemplate +from toscaparser.tests.base import TestCase +from toscaparser.utils import yamlparser class ScalarUnitPositiveTest(TestCase): diff --git a/translator/toscalib/tests/test_topology_template.py b/toscaparser/tests/test_topology_template.py similarity index 96% rename from translator/toscalib/tests/test_topology_template.py rename to toscaparser/tests/test_topology_template.py index c0d54e9..e6d3f80 100644 --- a/translator/toscalib/tests/test_topology_template.py +++ b/toscaparser/tests/test_topology_template.py @@ -12,11 +12,11 @@ import os -from translator.toscalib.tests.base import TestCase -from translator.toscalib.topology_template import TopologyTemplate -import translator.toscalib.utils.yamlparser +from toscaparser.tests.base import TestCase +from toscaparser.topology_template import TopologyTemplate +import toscaparser.utils.yamlparser -YAML_LOADER = translator.toscalib.utils.yamlparser.load_yaml +YAML_LOADER = toscaparser.utils.yamlparser.load_yaml class TopologyTemplateTest(TestCase): diff --git a/translator/toscalib/tests/test_toscadef.py b/toscaparser/tests/test_toscadef.py similarity index 97% rename from translator/toscalib/tests/test_toscadef.py rename to toscaparser/tests/test_toscadef.py index 20c434e..b4f980a 100644 --- a/translator/toscalib/tests/test_toscadef.py +++ b/toscaparser/tests/test_toscadef.py @@ -10,11 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -from translator.toscalib.common import exception -from translator.toscalib.elements.artifacttype import ArtifactTypeDef -import translator.toscalib.elements.interfaces as ifaces -from translator.toscalib.elements.nodetype import NodeType -from translator.toscalib.tests.base import TestCase +from toscaparser.common import exception +from toscaparser.elements.artifacttype import ArtifactTypeDef +import toscaparser.elements.interfaces as ifaces +from toscaparser.elements.nodetype import NodeType +from toscaparser.tests.base import TestCase compute_type = NodeType('tosca.nodes.Compute') component_type = NodeType('tosca.nodes.SoftwareComponent') diff --git a/translator/toscalib/tests/test_toscatpl.py b/toscaparser/tests/test_toscatpl.py similarity index 95% rename from translator/toscalib/tests/test_toscatpl.py rename to toscaparser/tests/test_toscatpl.py index 323257b..b85939d 100644 --- a/translator/toscalib/tests/test_toscatpl.py +++ b/toscaparser/tests/test_toscatpl.py @@ -13,15 +13,15 @@ import os import six -from translator.toscalib.common import exception -import translator.toscalib.elements.interfaces as ifaces -from translator.toscalib.elements.nodetype import NodeType -from translator.toscalib.functions import GetInput -from translator.toscalib.functions import GetProperty -from translator.toscalib.nodetemplate import NodeTemplate -from translator.toscalib.tests.base import TestCase -from translator.toscalib.tosca_template import ToscaTemplate -import translator.toscalib.utils.yamlparser +from toscaparser.common import exception +import toscaparser.elements.interfaces as ifaces +from toscaparser.elements.nodetype import NodeType +from toscaparser.functions import GetInput +from toscaparser.functions import GetProperty +from toscaparser.nodetemplate import NodeTemplate +from toscaparser.tests.base import TestCase +from toscaparser.tosca_template import ToscaTemplate +import toscaparser.utils.yamlparser class ToscaTemplateTest(TestCase): @@ -324,7 +324,7 @@ class ToscaTemplateTest(TestCase): self._requirements_not_implemented(tpl_snippet_3, 'my_webserver2') def _requirements_not_implemented(self, tpl_snippet, tpl_name): - nodetemplates = (translator.toscalib.utils.yamlparser. + nodetemplates = (toscaparser.utils.yamlparser. simple_parse(tpl_snippet))['node_templates'] self.assertRaises( NotImplementedError, @@ -355,9 +355,9 @@ class ToscaTemplateTest(TestCase): required: no ''' expected_capabilities = ['test_cap'] - nodetemplates = (translator.toscalib.utils.yamlparser. + nodetemplates = (toscaparser.utils.yamlparser. simple_parse(tpl_snippet))['node_templates'] - custom_def = (translator.toscalib.utils.yamlparser. + custom_def = (toscaparser.utils.yamlparser. simple_parse(custom_def)) name = list(nodetemplates.keys())[0] tpl = NodeTemplate(name, nodetemplates, custom_def) @@ -373,7 +373,7 @@ class ToscaTemplateTest(TestCase): test_cap: type: tosca.capabilities.TestCapability ''' - custom_def = (translator.toscalib.utils.yamlparser. + custom_def = (toscaparser.utils.yamlparser. simple_parse(custom_def)) tpl = NodeTemplate(name, nodetemplates, custom_def) err = self.assertRaises( diff --git a/translator/toscalib/tests/test_toscatplvalidation.py b/toscaparser/tests/test_toscatplvalidation.py similarity index 97% rename from translator/toscalib/tests/test_toscatplvalidation.py rename to toscaparser/tests/test_toscatplvalidation.py index 800fcba..5a5be94 100644 --- a/translator/toscalib/tests/test_toscatplvalidation.py +++ b/toscaparser/tests/test_toscatplvalidation.py @@ -13,14 +13,14 @@ import os import six -from translator.toscalib.common import exception -from translator.toscalib.nodetemplate import NodeTemplate -from translator.toscalib.parameters import Input -from translator.toscalib.parameters import Output -from translator.toscalib.relationship_template import RelationshipTemplate -from translator.toscalib.tests.base import TestCase -from translator.toscalib.tosca_template import ToscaTemplate -import translator.toscalib.utils.yamlparser +from toscaparser.common import exception +from toscaparser.nodetemplate import NodeTemplate +from toscaparser.parameters import Input +from toscaparser.parameters import Output +from toscaparser.relationship_template import RelationshipTemplate +from toscaparser.tests.base import TestCase +from toscaparser.tosca_template import ToscaTemplate +import toscaparser.utils.yamlparser class ToscaTemplateValidationTest(TestCase): @@ -58,7 +58,7 @@ class ToscaTemplateValidationTest(TestCase): constraint: - valid_values: [ 1, 2, 4, 8 ] ''' - inputs = (translator.toscalib.utils.yamlparser. + inputs = (toscaparser.utils.yamlparser. simple_parse(tpl_snippet)['inputs']) name, attrs = list(inputs.items())[0] input = Input(name, attrs) @@ -77,7 +77,7 @@ class ToscaTemplateValidationTest(TestCase): description: IP address of server instance. values: { get_property: [server, private_address] } ''' - outputs = (translator.toscalib.utils.yamlparser. + outputs = (toscaparser.utils.yamlparser. simple_parse(tpl_snippet)['outputs']) name, attrs = list(outputs.items())[0] output = Output(name, attrs) @@ -95,7 +95,7 @@ class ToscaTemplateValidationTest(TestCase): descriptions: IP address of server instance. value: { get_property: [server, private_address] } ''' - outputs = (translator.toscalib.utils.yamlparser. + outputs = (toscaparser.utils.yamlparser. simple_parse(tpl_snippet)['outputs']) name, attrs = list(outputs.items())[0] output = Output(name, attrs) @@ -113,7 +113,7 @@ class ToscaTemplateValidationTest(TestCase): def_file = os.path.join( os.path.dirname(os.path.abspath(__file__)), "data/custom_types/wordpress.yaml") - custom_type = translator.toscalib.utils.yamlparser.load_yaml(def_file) + custom_type = toscaparser.utils.yamlparser.load_yaml(def_file) node_types = custom_type['node_types'] for name in node_types: defintion = node_types[name] @@ -122,7 +122,7 @@ class ToscaTemplateValidationTest(TestCase): def _single_node_template_content_test(self, tpl_snippet, expectederror, expectedmessage): - nodetemplates = (translator.toscalib.utils.yamlparser. + nodetemplates = (toscaparser.utils.yamlparser. simple_ordered_parse(tpl_snippet))['node_templates'] name = list(nodetemplates.keys())[0] try: @@ -648,7 +648,7 @@ class ToscaTemplateValidationTest(TestCase): def _single_rel_template_content_test(self, tpl_snippet, expectederror, expectedmessage): - rel_template = (translator.toscalib.utils.yamlparser. + rel_template = (toscaparser.utils.yamlparser. simple_parse(tpl_snippet))['relationship_templates'] name = list(rel_template.keys())[0] rel_template = RelationshipTemplate(rel_template[name], name) diff --git a/translator/toscalib/tests/test_validate_tosca_version.py b/toscaparser/tests/test_validate_tosca_version.py similarity index 96% rename from translator/toscalib/tests/test_validate_tosca_version.py rename to toscaparser/tests/test_validate_tosca_version.py index fb40b71..22878d1 100644 --- a/translator/toscalib/tests/test_validate_tosca_version.py +++ b/toscaparser/tests/test_validate_tosca_version.py @@ -10,10 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. -from translator.toscalib.common.exception import ( +from toscaparser.common.exception import ( InvalidTOSCAVersionPropertyException) -from translator.toscalib.tests.base import TestCase -from translator.toscalib.utils.validateutils import TOSCAVersionProperty +from toscaparser.tests.base import TestCase +from toscaparser.utils.validateutils import TOSCAVersionProperty class TOSCAVersionPropertyTest(TestCase): diff --git a/translator/toscalib/topology_template.py b/toscaparser/topology_template.py similarity index 94% rename from translator/toscalib/topology_template.py rename to toscaparser/topology_template.py index 5ff9147..c318f6d 100644 --- a/translator/toscalib/topology_template.py +++ b/toscaparser/topology_template.py @@ -13,14 +13,14 @@ import logging -from translator.toscalib.common import exception -from translator.toscalib import functions -from translator.toscalib.groups import NodeGroup -from translator.toscalib.nodetemplate import NodeTemplate -from translator.toscalib.parameters import Input -from translator.toscalib.parameters import Output -from translator.toscalib.relationship_template import RelationshipTemplate -from translator.toscalib.tpl_relationship_graph import ToscaGraph +from toscaparser.common import exception +from toscaparser import functions +from toscaparser.groups import NodeGroup +from toscaparser.nodetemplate import NodeTemplate +from toscaparser.parameters import Input +from toscaparser.parameters import Output +from toscaparser.relationship_template import RelationshipTemplate +from toscaparser.tpl_relationship_graph import ToscaGraph # Topology template key names diff --git a/translator/toscalib/tosca_template.py b/toscaparser/tosca_template.py similarity index 92% rename from translator/toscalib/tosca_template.py rename to toscaparser/tosca_template.py index 691a37f..2b35a63 100644 --- a/translator/toscalib/tosca_template.py +++ b/toscaparser/tosca_template.py @@ -14,12 +14,12 @@ import logging import os -from translator.toscalib.common.exception import InvalidTemplateVersion -from translator.toscalib.common.exception import MissingRequiredFieldError -from translator.toscalib.common.exception import UnknownFieldError -from translator.toscalib.topology_template import TopologyTemplate -from translator.toscalib.tpl_relationship_graph import ToscaGraph -import translator.toscalib.utils.yamlparser +from toscaparser.common.exception import InvalidTemplateVersion +from toscaparser.common.exception import MissingRequiredFieldError +from toscaparser.common.exception import UnknownFieldError +from toscaparser.topology_template import TopologyTemplate +from toscaparser.tpl_relationship_graph import ToscaGraph +import toscaparser.utils.yamlparser # TOSCA template key names @@ -36,7 +36,7 @@ SECTIONS = (DEFINITION_VERSION, DEFAULT_NAMESPACE, TEMPLATE_NAME, log = logging.getLogger("tosca.model") -YAML_LOADER = translator.toscalib.utils.yamlparser.load_yaml +YAML_LOADER = toscaparser.utils.yamlparser.load_yaml class ToscaTemplate(object): diff --git a/translator/toscalib/tpl_relationship_graph.py b/toscaparser/tpl_relationship_graph.py similarity index 100% rename from translator/toscalib/tpl_relationship_graph.py rename to toscaparser/tpl_relationship_graph.py diff --git a/translator/toscalib/utils/__init__.py b/toscaparser/utils/__init__.py similarity index 100% rename from translator/toscalib/utils/__init__.py rename to toscaparser/utils/__init__.py diff --git a/translator/toscalib/utils/gettextutils.py b/toscaparser/utils/gettextutils.py similarity index 100% rename from translator/toscalib/utils/gettextutils.py rename to toscaparser/utils/gettextutils.py diff --git a/translator/toscalib/utils/validateutils.py b/toscaparser/utils/validateutils.py similarity index 97% rename from translator/toscalib/utils/validateutils.py rename to toscaparser/utils/validateutils.py index 56116af..f24e4d4 100644 --- a/translator/toscalib/utils/validateutils.py +++ b/toscaparser/utils/validateutils.py @@ -17,9 +17,9 @@ import numbers import re import six -from translator.toscalib.common.exception import ( +from toscaparser.common.exception import ( InvalidTOSCAVersionPropertyException) -from translator.toscalib.utils.gettextutils import _ +from toscaparser.utils.gettextutils import _ log = logging.getLogger('tosca') diff --git a/translator/toscalib/utils/yamlparser.py b/toscaparser/utils/yamlparser.py similarity index 100% rename from translator/toscalib/utils/yamlparser.py rename to toscaparser/utils/yamlparser.py diff --git a/translator/__init__.py b/translator/__init__.py deleted file mode 100644 index d6fa60c..0000000 --- a/translator/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- - -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import pbr.version - - -__version__ = pbr.version.VersionInfo( - 'tosca-parser').version_string()