diff options
| -rw-r--r-- | cli/__main__.py | 10 | ||||
| -rw-r--r-- | setup.py | 13 |
2 files changed, 8 insertions, 15 deletions
diff --git a/cli/__main__.py b/cli/__main__.py index f4e267b..2fe4d68 100644 --- a/cli/__main__.py +++ b/cli/__main__.py @@ -22,14 +22,14 @@ from aria import install_aria_extensions import os
import shutil
import tempfile
-from aria.loading import LiteralLocation
-from aria.consumption import (
+from aria.parser.loading import LiteralLocation
+from aria.parser.consumption import (
ConsumptionContext,
ConsumerChain,
Read,
Validate,
- Model,
- Instance
+ ServiceTemplate,
+ ServiceInstance
)
def csar_create_func(namespace):
@@ -52,7 +52,7 @@ def csar_validate_func(namespace): context.loading.prefixes += [os.path.join(reader.destination, 'definitions')]
context.presentation.location = LiteralLocation(reader.entry_definitions_yaml)
print reader.entry_definitions_yaml
- chain = ConsumerChain(context, (Read, Validate, Model, Instance))
+ chain = ConsumerChain(context, (Read, Validate, ServiceTemplate, ServiceInstance))
chain.consume()
if context.validation.dump_issues():
raise RuntimeError('Validation failed')
@@ -64,14 +64,7 @@ setup( },
# Please make sure this is in sync with src/aria/requirements.txt
install_requires=[
- 'ruamel.yaml==0.12.14',
- 'requests',
- 'logging',
- 'clint==0.5.1',
- 'CacheControl[filecache]==0.11.6',
- 'lockfile',
- 'Jinja2==2.8',
- 'shortuuid==0.4.3',
- 'jsonpickle',
- 'aria == 0.1'])
+ 'ruamel.yaml<0.12.0,>=0.11.12',
+ 'requests<2.14.0,>=2.3.0',
+ 'apache-ariatosca==0.1.1'])
|