Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-321-clearwater 6aa296a66 -> 0c3f53d80 (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/0c3f53d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/0c3f53d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/0c3f53d8 Branch: refs/heads/ARIA-321-clearwater Commit: 0c3f53d8071e1cac2a7a27217e59d9fbfd9cc618 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 13:46:29 2017 -0500 ---------------------------------------------------------------------- .travis.yml | 25 ++++++++++++--- README.rst | 33 +++++++++++--------- 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 ++ tox.ini | 7 +++-- 13 files changed, 60 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0c3f53d8/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index a7362e7..f6ba91e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,11 +10,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -sudo: false +dist: trusty language: python -dist: precise python: - '2.7' @@ -29,15 +28,31 @@ env: - TOX_ENV=py26ssh - TOX_ENV=docs -install: +addons: + apt: + sources: + - sourceline: 'ppa:fkrull/deadsnakes' + packages: + - python2.6 + - python2.6-dev + +before_install: - pip install --upgrade pip - pip install --upgrade setuptools - pip install tox +# - pip install pythonbrew +# - pythonbrew_install +# - source "$HOME/.pythonbrew/etc/bashrc" +# - sudo apt install libsqlite3-dev +# - pythonbrew install 2.6.9 -j $(nproc) +# - pythonbrew symlink script: - - pip --version + - uname -a + - nproc - tox --version - - PYTEST_PROCESSES=1 tox -e $TOX_ENV + - PYTEST_PROCESSES=$(nproc) tox -e $TOX_ENV +# - PYTEST_PROCESSES=$(nproc) PY26="$HOME/.pythonbrew/bin/py2.6.9" tox -e $TOX_ENV # The PYTEST_PROCESSES environment var is used in tox.ini to override the --numprocesses argument # for PyTest's xdist plugin. The reason this is necessary is that conventional Travis environments http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0c3f53d8/README.rst ---------------------------------------------------------------------- diff --git a/README.rst b/README.rst index c488335..6f8885c 100644 --- a/README.rst +++ b/README.rst @@ -36,26 +36,28 @@ To install ARIA directly from PyPI (using a ``wheel``), use:: pip install apache-ariatosca To install ARIA from source, download the source tarball from -`PyPI <https://pypi.python.org/pypi/apache-ariatosca>`__, extract and ``cd`` into the extract dir, and run:: +`PyPI <https://pypi.python.org/pypi/apache-ariatosca>`__, extract and ``cd`` into the extract dir, +and run:: pip install --upgrade pip setuptools pip install . -| The source package comes along with relevant examples, documentation, ``requirements.txt`` (for installing specifically the frozen dependencies' versions with which ARIA was tested) and more. -| +| The source package comes along with relevant examples, documentation, ``requirements.txt`` (for +| installing specifically the frozen dependencies' versions with which ARIA was tested) and more. | | ARIA has additional optional dependencies. These are required for running operations over SSH. -| Below are instructions on how to install these dependencies, including required system dependencies per OS. -| -| Note: These dependencies may have varying licenses which may not be compatible with Apache license 2.0. +| Below are instructions on how to install these dependencies, including required system +| dependencies per OS. | +| Note: These dependencies may have varying licenses which may not be compatible with Apache license +| 2.0. -**Ubuntu/Debian** (tested on Ubuntu14.04, Ubuntu16.04):: +**Ubuntu/Debian** (tested on Ubuntu 14.04, Ubuntu 16.04):: apt-get install -y python-dev gcc libffi-dev libssl-dev pip install apache-ariatosca[ssh] -**Centos** (tested on Centos6.6, Centos7):: +**CentOS/Fedora** (tested on CentOS 6.6, CentOS 7):: yum install -y python-devel gcc libffi-devel openssl-devel pip install apache-ariatosca[ssh] @@ -65,7 +67,7 @@ To install ARIA from source, download the source tarball from pacman -Syu --noconfirm python2 gcc libffi openssl pip2 install apache-ariatosca[ssh] -**Windows** (tested on Win10):: +**Windows** (tested on Windows 10):: # no additional system requirements are needed pip install apache-ariatosca[ssh] @@ -76,7 +78,7 @@ To install ARIA from source, download the source tarball from -To install ``pip``, either use your distro's package management system, or run:: +To install ``pip``, either use your operating system's package management system, or run:: wget http://bootstrap.pypa.io/get-pip.py python get-pip.py @@ -117,7 +119,8 @@ Contribution You are welcome and encouraged to participate and contribute to the ARIA project. Please see our guide to -`Contributing to ARIA <https://cwiki.apache.org/confluence/display/ARIATOSCA/Contributing+to+ARIA>`__. +`Contributing to ARIA +<https://cwiki.apache.org/confluence/display/ARIATOSCA/Contributing+to+ARIA>`__. Feel free to also provide feedback on the mailing lists (see `Resources <#user-content-resources>`__ section). @@ -126,12 +129,12 @@ section). Resources --------- -- `ARIA homepage <http://ariatosca.incubator.apache.org/>`__ -- `ARIA wiki <https://cwiki.apache.org/confluence/display/AriaTosca>`__ +- `ARIA homepage <http://ariatosca.incubator.apache.org/>`__ +- `ARIA wiki <https://cwiki.apache.org/confluence/display/AriaTosca>`__ - `Issue tracker <https://issues.apache.org/jira/browse/ARIA>`__ -- Dev mailing list: [email protected] -- User mailing list: [email protected] +- Dev mailing list: [email protected] +- User mailing list: [email protected] Subscribe by sending a mail to ``<group>[email protected]`` (e.g. ``[email protected]``). See information on how to subscribe to mailing http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0c3f53d8/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/0c3f53d8/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/0c3f53d8/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/0c3f53d8/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/0c3f53d8/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/0c3f53d8/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/0c3f53d8/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/0c3f53d8/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/0c3f53d8/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/0c3f53d8/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 http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0c3f53d8/tox.ini ---------------------------------------------------------------------- diff --git a/tox.ini b/tox.ini index ff71e05..765435a 100644 --- a/tox.ini +++ b/tox.ini @@ -13,6 +13,7 @@ [tox] envlist=py27,py26,py27e2e,py26e2e,pywin,py27ssh,pylint_code,pylint_tests,docs processes={env:PYTEST_PROCESSES:auto} +py26={env:PY26:python2.6} [testenv] whitelist_externals= @@ -28,11 +29,11 @@ deps= --requirement tests/requirements.txt basepython= - py26: python2.6 + py26: {[tox]py26} py27: python2.7 - py26e2e: python2.6 + py26e2e: {[tox]py26} py27e2e: python2.7 - py26ssh: python2.6 + py26ssh: {[tox]py26} py27ssh: python2.7 pywin: {env:PYTHON:}\python.exe pylint_code: python2.7
