Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-321-clearwater 8c2c74924 -> b89269684 (forced update)
Requested fixes Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/b8926968 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/b8926968 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/b8926968 Branch: refs/heads/ARIA-321-clearwater Commit: b892696844ccbce952f8ca5ba3cb0e2fcf90ed35 Parents: fe48186 Author: Tal Liron <[email protected]> Authored: Wed Sep 6 08:38:56 2017 -0500 Committer: Tal Liron <[email protected]> Committed: Wed Sep 6 09:49:39 2017 -0500 ---------------------------------------------------------------------- .travis.yml | 8 +++++- aria/modeling/service_instance.py | 26 -------------------- examples/clearwater/scripts/bono/delete.sh | 2 ++ examples/clearwater/scripts/dime/delete.sh | 2 ++ examples/clearwater/scripts/ellis/delete.sh | 2 ++ examples/clearwater/scripts/homer/delete.sh | 2 ++ examples/clearwater/scripts/homestead/delete.sh | 2 ++ examples/clearwater/scripts/memento/delete.sh | 2 ++ examples/clearwater/scripts/ralf/delete.sh | 2 ++ examples/clearwater/scripts/sprout/delete.sh | 2 ++ examples/clearwater/scripts/vellum/delete.sh | 2 ++ 11 files changed, 25 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b8926968/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index a7362e7..d7252fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,10 @@ sudo: false +dist: precise + language: python -dist: precise python: - '2.7' @@ -32,9 +33,14 @@ env: install: - pip install --upgrade pip - pip install --upgrade setuptools + - pip install pythonbrew - pip install tox + - pythonbrew_install + - source "$HOME/.pythonbrew/etc/bashrc" script: + - uname -a + - nproc - pip --version - tox --version - PYTEST_PROCESSES=1 tox -e $TOX_ENV http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b8926968/aria/modeling/service_instance.py ---------------------------------------------------------------------- diff --git a/aria/modeling/service_instance.py b/aria/modeling/service_instance.py index df16bb8..01c4da9 100644 --- a/aria/modeling/service_instance.py +++ b/aria/modeling/service_instance.py @@ -258,32 +258,6 @@ class ServiceBase(InstanceModelMixin): return None - def satisfy_requirements(self): - satisfied = True - for node in self.nodes.itervalues(): - if not node.satisfy_requirements(): - satisfied = False - return satisfied - - def validate_capabilities(self): - satisfied = True - for node in self.nodes.itervalues(): - if not node.validate_capabilities(): - satisfied = False - return satisfied - - def find_hosts(self): - for node in self.nodes.itervalues(): - node.find_host() - - def configure_operations(self): - for node in self.nodes.itervalues(): - node.configure_operations() - for group in self.groups.itervalues(): - group.configure_operations() - for operation in self.workflows.itervalues(): - operation.configure() - @property def as_raw(self): return collections.OrderedDict(( http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b8926968/examples/clearwater/scripts/bono/delete.sh ---------------------------------------------------------------------- diff --git a/examples/clearwater/scripts/bono/delete.sh b/examples/clearwater/scripts/bono/delete.sh index 5cae7ef..73485c3 100644 --- a/examples/clearwater/scripts/bono/delete.sh +++ b/examples/clearwater/scripts/bono/delete.sh @@ -13,3 +13,5 @@ # 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. + +TODO http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b8926968/examples/clearwater/scripts/dime/delete.sh ---------------------------------------------------------------------- diff --git a/examples/clearwater/scripts/dime/delete.sh b/examples/clearwater/scripts/dime/delete.sh index 5cae7ef..73485c3 100644 --- a/examples/clearwater/scripts/dime/delete.sh +++ b/examples/clearwater/scripts/dime/delete.sh @@ -13,3 +13,5 @@ # 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. + +TODO http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b8926968/examples/clearwater/scripts/ellis/delete.sh ---------------------------------------------------------------------- diff --git a/examples/clearwater/scripts/ellis/delete.sh b/examples/clearwater/scripts/ellis/delete.sh index 5cae7ef..73485c3 100644 --- a/examples/clearwater/scripts/ellis/delete.sh +++ b/examples/clearwater/scripts/ellis/delete.sh @@ -13,3 +13,5 @@ # 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. + +TODO http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b8926968/examples/clearwater/scripts/homer/delete.sh ---------------------------------------------------------------------- diff --git a/examples/clearwater/scripts/homer/delete.sh b/examples/clearwater/scripts/homer/delete.sh index 5cae7ef..73485c3 100644 --- a/examples/clearwater/scripts/homer/delete.sh +++ b/examples/clearwater/scripts/homer/delete.sh @@ -13,3 +13,5 @@ # 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. + +TODO http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b8926968/examples/clearwater/scripts/homestead/delete.sh ---------------------------------------------------------------------- diff --git a/examples/clearwater/scripts/homestead/delete.sh b/examples/clearwater/scripts/homestead/delete.sh index 5cae7ef..73485c3 100644 --- a/examples/clearwater/scripts/homestead/delete.sh +++ b/examples/clearwater/scripts/homestead/delete.sh @@ -13,3 +13,5 @@ # 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. + +TODO http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b8926968/examples/clearwater/scripts/memento/delete.sh ---------------------------------------------------------------------- diff --git a/examples/clearwater/scripts/memento/delete.sh b/examples/clearwater/scripts/memento/delete.sh index 5cae7ef..73485c3 100644 --- a/examples/clearwater/scripts/memento/delete.sh +++ b/examples/clearwater/scripts/memento/delete.sh @@ -13,3 +13,5 @@ # 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. + +TODO http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b8926968/examples/clearwater/scripts/ralf/delete.sh ---------------------------------------------------------------------- diff --git a/examples/clearwater/scripts/ralf/delete.sh b/examples/clearwater/scripts/ralf/delete.sh index 5cae7ef..73485c3 100644 --- a/examples/clearwater/scripts/ralf/delete.sh +++ b/examples/clearwater/scripts/ralf/delete.sh @@ -13,3 +13,5 @@ # 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. + +TODO http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b8926968/examples/clearwater/scripts/sprout/delete.sh ---------------------------------------------------------------------- diff --git a/examples/clearwater/scripts/sprout/delete.sh b/examples/clearwater/scripts/sprout/delete.sh index 5cae7ef..73485c3 100644 --- a/examples/clearwater/scripts/sprout/delete.sh +++ b/examples/clearwater/scripts/sprout/delete.sh @@ -13,3 +13,5 @@ # 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. + +TODO http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b8926968/examples/clearwater/scripts/vellum/delete.sh ---------------------------------------------------------------------- diff --git a/examples/clearwater/scripts/vellum/delete.sh b/examples/clearwater/scripts/vellum/delete.sh index 5cae7ef..73485c3 100644 --- a/examples/clearwater/scripts/vellum/delete.sh +++ b/examples/clearwater/scripts/vellum/delete.sh @@ -13,3 +13,5 @@ # 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. + +TODO
