Merge branch 'ARIA-275-update-NFV-profile-to-csd04' of https://git-wip-us.apache.org/repos/asf/incubator-ariatosca into ARIA-275-update-NFV-profile-to-csd04
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/a62f4c23 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/a62f4c23 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/a62f4c23 Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04 Commit: a62f4c239a6b94232e11224411d7b8a6e9217966 Parents: 5e8044d 9240e20 Author: Tal Liron <[email protected]> Authored: Wed Jun 7 15:32:25 2017 -0500 Committer: Tal Liron <[email protected]> Committed: Wed Jun 7 15:32:25 2017 -0500 ---------------------------------------------------------------------- aria/cli/commands/services.py | 23 ++++++++--------- aria/modeling/models.py | 4 +-- aria/storage/sql_mapi.py | 3 ++- examples/hello-world/helloworld.yaml | 16 ++++++++---- tests/cli/test_services.py | 26 ++++++++++++++++++-- tests/end2end/test_hello_world.py | 1 + tests/mock/models.py | 21 ++++++++++------ .../node-cellar/node-cellar.yaml | 12 +++++++++ 8 files changed, 78 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
